FGT: Fix custom VHD UI

40net-cloud · Jul 26, 2024 · 80e1126 · 80e1126
1 parent 7e888f5
commit 80e1126
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 30 deletions.
diff --git a/FortiGate/A-Single-VM/createUiDefinition.json b/FortiGate/A-Single-VM/createUiDefinition.json
@@ -1109,12 +1109,12 @@
               {
                 "name": "customvhdinfo",
                 "type": "Microsoft.Common.InfoBox",
-                "visible": "[steps('advanced').customvhd.customvhdcheck]",
                 "options": {
                   "icon": "Info",
                   "text": "For BYOL it is possible to upload a specific FortiGate image to Azure provided by support. Provide the resource ID of the required VM image version in the field below.",
                   "uri": "https://docs.fortinet.com/document/fortigate-public-cloud/7.2.0/azure-administration-guide/392531/deploying-fortigate-vm-from-a-vhd-image-file"
-                }
+                },
+                "visible": "[steps('advanced').customvhd.customvhdcheck]"
               },
               {
                 "name": "resourceid",
@@ -1123,21 +1123,15 @@
                 "defaultValue": "",
                 "toolTip": "Azure Compute Gallery Image Version resource ID",
                 "constraints": {
-                  "required": "[and(steps('advanced').customvhd.customvhdcheck, equals(basics('fortiGateInstanceArchitecture'), 'arm64'))]",
-                  "regex": "^[\\w\\W\n\t]{0,10240}$",
-                  "validationMessage": "All characters allowed, max 10240 characters."
+                  "required": false,
+                  "validations": [
+                    {
+                      "regex": "^[\\w\\W\n\t]{0,1024}$",
+                      "message": "All characters allowed, max 1024 characters."
+                    }
+                  ]
                 },
-                "visible": "[and(steps('advanced').customvhd.customvhdcheck,or(equals(steps('instance').instancetype_x64.fortiGateImageSKU_x64, 'fortinet_fg-vm'),equals(steps('instance').instancetype_arm64.fortiGateImageSKU_arm64, 'fortinet_fg-vm_arm64')))]"
-              },
-              {
-                "name": "customvhdinfo2",
-                "type": "Microsoft.Common.InfoBox",
-                "visible": "[and(steps('advanced').customvhd.customvhdcheck, equals(basics('fortiGateInstanceArchitecture'), 'arm64'))]",
-                "options": {
-                  "icon": "Info",
-                  "text": "An ARM64 based instance type was selected. This requires a custom image using an Azure Compute Gallery.",
-                  "uri": "https://docs.fortinet.com/document/fortigate-public-cloud/7.2.0/azure-administration-guide/392531/deploying-fortigate-vm-from-a-vhd-image-file"
-                }
+                "visible": "[steps('advanced').customvhd.customvhdcheck]"
               }
             ]
           }

diff --git a/FortiGate/Active-Active-ELB-ILB/createUiDefinition.json b/FortiGate/Active-Active-ELB-ILB/createUiDefinition.json
@@ -1536,33 +1536,39 @@
             "type": "Microsoft.Common.Section",
             "label": "Custom VHD",
             "elements": [
+              {
+                "name": "customvhdcheck",
+                "type": "Microsoft.Common.CheckBox",
+                "label": "Use Azure compute gallery VHD for deployment",
+                "toolTip": "Provide a customer VHD image provided by Fortinet",
+                "visible": true
+              },
               {
                 "name": "customvhdinfo",
                 "type": "Microsoft.Common.InfoBox",
-                "visible": true,
                 "options": {
                   "icon": "Info",
                   "text": "For BYOL it is possible to upload a specific FortiGate image to Azure provided by support. Provide the resource ID of the required VM image version in the field below.",
                   "uri": "https://docs.fortinet.com/document/fortigate-public-cloud/7.2.0/azure-administration-guide/392531/deploying-fortigate-vm-from-a-vhd-image-file"
-                }
+                },
+                "visible": "[steps('advanced').customvhd.customvhdcheck]"
               },
               {
                 "name": "resourceid",
                 "type": "Microsoft.Common.TextBox",
                 "label": "Azure Compute Gallery Image Version resource ID",
                 "defaultValue": "",
                 "toolTip": "Azure Compute Gallery Image Version resource ID",
-                "visible": "[equals(steps('instance').instancetype_x64.fortiGateImageSKU_x64,'fortinet_fg-vm')]"
-              },
-              {
-                "name": "customvhdinfo2",
-                "type": "Microsoft.Common.InfoBox",
-                "visible": "[equals(basics('fortiGateInstanceArchitecture'),'arm64')]",
-                "options": {
-                  "icon": "Info",
-                  "text": "An ARM64 based instance type was selected.",
-                  "uri": "https://docs.fortinet.com/document/fortigate-public-cloud/7.2.0/azure-administration-guide/392531/deploying-fortigate-vm-from-a-vhd-image-file"
-                }
+                "constraints": {
+                  "required": false,
+                  "validations": [
+                    {
+                      "regex": "^[\\w\\W\n\t]{0,1024}$",
+                      "message": "All characters allowed, max 1024 characters."
+                    }
+                  ]
+                },
+                "visible": "[steps('advanced').customvhd.customvhdcheck]"
               }
             ]
           }

diff --git a/FortiGate/Active-Passive-ELB-ILB/createUiDefinition.json b/FortiGate/Active-Passive-ELB-ILB/createUiDefinition.json
@@ -1295,7 +1295,6 @@
               {
                 "name": "customvhdinfo",
                 "type": "Microsoft.Common.InfoBox",
-                "visible": "[steps('advanced').customvhd.customvhdcheck]",
                 "options": {
                   "icon": "Info",
                   "text": "For BYOL it is possible to upload a specific FortiGate image to Azure provided by support. Provide the resource ID of the required VM image version in the field below.",