renaming fields and updating packer

vhdbuilder/packer/produce-packer-settings-functions.sh

@@ -268,6 +268,18 @@ function prepare_windows_vhd() {
 	WINDOWS_IMAGE_VERSION=$(jq -r ".WindowsBaseVersions.\"${WINDOWS_SKU}\".base_image_version" <$CDIR/windows/windows_settings.json)
 	WINDOWS_IMAGE_NAME=$(jq -r ".WindowsBaseVersions.\"${WINDOWS_SKU}\".windows_image_name" <$CDIR/windows/windows_settings.json)
 	OS_DISK_SIZE=$(jq -r ".WindowsBaseVersions.\"${WINDOWS_SKU}\".os_disk_size" <$CDIR/windows/windows_settings.json)
+
+	local sku_publisher
+	sku_publisher=$(jq -r ".WindowsBaseVersions.\"${WINDOWS_SKU}\".base_image_publisher" <$CDIR/windows/windows_settings.json)
+	if [ "${sku_publisher}" != "null" ]; then
+		WINDOWS_IMAGE_PUBLISHER="${sku_publisher}"
+	fi
+	local sku_offer
+	sku_offer=$(jq -r ".WindowsBaseVersions.\"${WINDOWS_SKU}\".base_image_offer" <$CDIR/windows/windows_settings.json)
+	if [ "${sku_offer}" != "null" ]; then
+		WINDOWS_IMAGE_OFFER="${sku_offer}"
+	fi
+
 	if [ "null" != "${OS_DISK_SIZE}" ]; then
 		echo "Setting os_disk_size_gb to the value in windows-settings.json for ${WINDOWS_SKU}: ${OS_DISK_SIZE}"
 		os_disk_size_gb=${OS_DISK_SIZE}
@@ -278,6 +290,8 @@ function prepare_windows_vhd() {
 	imported_windows_image_name="${WINDOWS_IMAGE_NAME}-imported-${CREATE_TIME}-${RANDOM}"
 
 	echo "Got base image data: "
+	echo "  WINDOWS_IMAGE_PUBLISHER: ${WINDOWS_IMAGE_PUBLISHER}"
+	echo "  WINDOWS_IMAGE_OFFER: ${WINDOWS_IMAGE_OFFER}"
 	echo "  WINDOWS_IMAGE_SKU: ${WINDOWS_IMAGE_SKU}"
 	echo "  WINDOWS_IMAGE_VERSION: ${WINDOWS_IMAGE_VERSION}"
 	echo "  WINDOWS_IMAGE_NAME: ${WINDOWS_IMAGE_NAME}"

vhdbuilder/packer/windows/windows_settings.json

@@ -16,8 +16,8 @@
   "WindowsBaseVersions": {
     "2022-containerd": {
       "os_disk_size": "35",
-      "publisherID": "MicrosoftWindowsServer",
-      "offerID": "windowsserver2022",
+      "base_image_publisher": "MicrosoftWindowsServer",
+      "base_image_offer": "windowsserver2022",
       "base_image_sku": "2022-Datacenter-Core-smalldisk",
       "windows_image_name": "windows-2022-containerd",
       "base_image_version": "20348.4773.260206",