From c35513e2091f4627b866e7209f98b6397e2952e1 Mon Sep 17 00:00:00 2001
From: tsweatman1 <155660739+tsweatman1@users.noreply.github.com>
Date: Fri, 9 Aug 2024 18:17:10 -0400
Subject: [PATCH] Corrected 'allowedValues' for Linux offer in UIDefinitionFile
 (#1076)

* Corrected 'allowedValues' for Linux offer in UIDefinitionFile

* GitHub Action: Build Bicep to JSON

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 src/bicep/form/mlz.portal.json |  2 +-
 src/bicep/mlz.bicep            |  8 +++++---
 src/bicep/mlz.json             | 10 ++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/bicep/form/mlz.portal.json b/src/bicep/form/mlz.portal.json
index d97d300c9..e427d20c0 100644
--- a/src/bicep/form/mlz.portal.json
+++ b/src/bicep/form/mlz.portal.json
@@ -1272,7 +1272,7 @@
                   "multiLine": true,
                   "constraints": {
                     "required": true,
-                    "allowedValues": "[if(equals(steps('remoteAccess').linuxVmSection.linuxVmImagePublisher, 'Canonical'), parse('[{\"label\": \"Ubuntu\",\"value\": \"ubuntu\"}]'), if(equals(steps('remoteAccess').linuxVmSection.linuxVmImagePublisher, 'RedHat'), parse('[{\"label\": \"RHEL\",\"value\": \"RHEL\"}]'), parse('[{\"label\": \"Debian\",\"value\": \"debian-12\"}]')))]"
+                    "allowedValues": "[if(equals(steps('remoteAccess').linuxVmSection.linuxVmImagePublisher, 'Canonical'), parse('[{\"label\": \"Archaic\",\"value\": \"ubuntuserver\"},{\"label\": \"Version 20\",\"value\": \"0001-com-ubuntu-server-focal\"},{\"label\": \"Version 22\",\"value\": \"0001-com-ubuntu-server-jammy\"}]'), if(equals(steps('remoteAccess').linuxVmSection.linuxVmImagePublisher, 'RedHat'), parse('[{\"label\": \"RHEL\",\"value\": \"RHEL\"}]'), parse('[{\"label\": \"Debian\",\"value\": \"debian-12\"}]')))]"
                   },
                   "visible": "[steps('remoteAccess').linuxVmSection.deployLinuxVirtualMachine]"
                 },
diff --git a/src/bicep/mlz.bicep b/src/bicep/mlz.bicep
index 21e100366..d336ea36d 100644
--- a/src/bicep/mlz.bicep
+++ b/src/bicep/mlz.bicep
@@ -378,13 +378,15 @@ param linuxVmOsDiskType string = 'Standard_LRS'
 @description('[Canonical for Ubuntu/RedHat/Debian] The available Linux Publishers')
 param linuxVmImagePublisher string = 'Canonical'
 @allowed([
-  'Ubuntu'
+  'ubuntuserver'
+  '0001-com-ubuntu-server-focal'
+  '0001-com-ubuntu-server-jammy'
   'RHEL'
   'Debian-12'
 ])
 @description('[Ubuntu/RHEL/Debian-12] The available Linux Offers')
-param linuxVmImageOffer string = 'Ubuntu'
-param linuxVmImageSku string = '18_04-lts-gen2'
+param linuxVmImageOffer string = '0001-com-ubuntu-server-focal'
+param linuxVmImageSku string = '20_04-lts-gen2'
 param linuxVmSize string = 'Standard_D2s_v3'
 
 @allowed([
diff --git a/src/bicep/mlz.json b/src/bicep/mlz.json
index 5d752a8af..274afd355 100644
--- a/src/bicep/mlz.json
+++ b/src/bicep/mlz.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "10326969842852970072"
+      "templateHash": "14639382000576629473"
     }
   },
   "parameters": {
@@ -659,9 +659,11 @@
     },
     "linuxVmImageOffer": {
       "type": "string",
-      "defaultValue": "Ubuntu",
+      "defaultValue": "0001-com-ubuntu-server-focal",
       "allowedValues": [
-        "Ubuntu",
+        "ubuntuserver",
+        "0001-com-ubuntu-server-focal",
+        "0001-com-ubuntu-server-jammy",
         "RHEL",
         "Debian-12"
       ],
@@ -671,7 +673,7 @@
     },
     "linuxVmImageSku": {
       "type": "string",
-      "defaultValue": "18_04-lts-gen2"
+      "defaultValue": "20_04-lts-gen2"
     },
     "linuxVmSize": {
       "type": "string",