From 51cc63091feda6eefd520182986abf6fc947ce2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jake=20Buchholz=20G=C3=B6kt=C3=BCrk?= <tomalok@gmail.com>
Date: Tue, 28 Dec 2021 13:11:16 -0800
Subject: [PATCH] Make AWS Images Work with CloudFormation

root device / block device needs full '/dev/...' for CloudFormation to work (individual instance launches worked just fine though).

Also...
* HOCON += introduces unwanted spaces in motd
* minor log.debug fixes
* update gen_releases.py --help note
---
 build               |  4 ++--
 clouds/aws.py       |  4 ++--
 configs/alpine.conf | 12 ++++++------
 gen_releases.py     | 12 +++++++-----
 image_configs.py    |  7 ++++---
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/build b/build
index 00c5b91..ba5b84b 100755
--- a/build
+++ b/build
@@ -128,10 +128,10 @@ def install_overlay(overlay):
             if is_images_conf(overlay, src_x):
                 rel_x = os.readlink(src_x)
                 if os.path.islink(dest_x):
-                    print(f"\toverriding {dest_x}")
+                    log.debug('overriding %s', dest_x)
                     os.unlink(dest_x)
 
-                print(f"\tln -s {rel_x} {dest_x}")
+                log.debug('ln -s %s %s', rel_x, dest_x)
                 os.symlink(rel_x, dest_x)
                 continue
 
diff --git a/clouds/aws.py b/clouds/aws.py
index 3a997b0..436caa7 100644
--- a/clouds/aws.py
+++ b/clouds/aws.py
@@ -204,13 +204,13 @@ class AWSCloudAdapter(CloudAdapterInterface):
             img = ec2c.register_image(
                 Architecture=self.ARCH[ic.arch],
                 BlockDeviceMappings=[{
-                    'DeviceName': 'xvda',
+                    'DeviceName': '/dev/xvda',
                     'Ebs': {'SnapshotId': snapshot_id}
                 }],
                 Description=description,
                 EnaSupport=True,
                 Name=ic.image_name,
-                RootDeviceName='xvda',
+                RootDeviceName='/dev/xvda',
                 SriovNetSupport='simple',
                 VirtualizationType='hvm',
                 BootMode=self.BOOT_MODE[ic.firmware],
diff --git a/configs/alpine.conf b/configs/alpine.conf
index e3aa9b4..ef335ea 100644
--- a/configs/alpine.conf
+++ b/configs/alpine.conf
@@ -18,13 +18,13 @@ Default {
   motd {
     welcome = "Welcome to Alpine!"
 
-    wiki =  "The Alpine Wiki contains a large amount of how-to guides and general\n"
-    wiki += "information about administrating Alpine systems.\n"
-    wiki += "See <https://wiki.alpinelinux.org/>."
+    wiki = "The Alpine Wiki contains a large amount of how-to guides and general\n"\
+      "information about administrating Alpine systems.\n"\
+      "See <https://wiki.alpinelinux.org/>."
 
-    version_notes =  "Release Notes:\n"
-    version_notes += "* <https://alpinelinux.org/posts/alpine-{version}.0/released.html>"
-    release_notes =  "* <https://alpinelinux.org/posts/{release}/released.html"
+    version_notes = "Release Notes:\n"\
+      "* <https://alpinelinux.org/posts/alpine-{version}.0/released.html>"
+    release_notes = "* <https://alpinelinux.org/posts/{release}/released.html"
   }
 
   # initial provisioning script and data directory
diff --git a/gen_releases.py b/gen_releases.py
index cd038b5..dd9cae2 100755
--- a/gen_releases.py
+++ b/gen_releases.py
@@ -7,11 +7,13 @@ import sys
 import textwrap
 
 NOTE = textwrap.dedent("""
-    This script's output is meant to be compatible with alpine-ec2-ami's
-    releases.yaml, in order to bridge the gap until https://alpinelinux.org/cloud
-    can be updated to be generated from another source, or dynamically calls an
-    published image metadata service.  This script should only be run after
-    the main 'build' script has been used successfully to publish all images.
+    This script's output is compatible with the retired alpine-ec2-ami repo's
+    releases/alpine.yaml, in order to bridge the gap until
+    https://alpinelinux.org/cloud dynamically calls a published-image metadata
+    service.  This script should only be run after the main 'build' script has
+    been used successfully to publish ALL images, and the STDOUT should be
+    committed to the https://gitlab.alpinelinux.org/alpine/infra/alpine-mksite
+    repo as 'cloud/releases-in.yaml'.
     """)
 
 sys.pycache_prefix = 'work/__pycache__'
diff --git a/image_configs.py b/image_configs.py
index 1eca45e..891ed3c 100644
--- a/image_configs.py
+++ b/image_configs.py
@@ -366,6 +366,7 @@ class ImageConfig():
         actions = {}
         revision = 0
         remote_image = clouds.latest_build_image(self)
+        log.debug('\n%s', remote_image)
         step_state = step == 'state'
 
         # enable actions based on the specified step
@@ -407,17 +408,17 @@ class ImageConfig():
         elif remote_image:
             if remote_image.imported:
                 # already imported, don't build/import again
-                log.info('%s - already imported', self.image_key)
+                log.debug('%s - already imported', self.image_key)
                 actions.pop('build', None)
                 actions.pop('import', None)
 
             if remote_image.published:
                 # NOTE: re-publishing can update perms or push to new regions
-                log.info('%s - already published', self.image_key)
+                log.debug('%s - already published', self.image_key)
 
         if self.local_path.exists():
             # local image's already built, don't rebuild
-            log.info('%s - already locally built', self.image_key)
+            log.debug('%s - already locally built', self.image_key)
             actions.pop('build', None)
 
         # merge remote_image data into image state