Merge pull request #21 from edburns/edburns-msft-15-update-properties-for-base-image

Address open issues to resolve #23

Author: git4rk

pom.xml

@@ -20,7 +20,7 @@
 
     <groupId>com.ibm.websphere.azure</groupId>
     <artifactId>azure.websphere-traditional.cluster</artifactId>
-    <version>1.3.8</version>
+    <version>1.3.12</version>
 
     <parent>
         <groupId>com.microsoft.azure.iaas</groupId>
@@ -38,8 +38,11 @@
         <azure.apiVersion2>2019-06-01</azure.apiVersion2>
         <cluster.start>c2efe274-0dc2-50f3-b51f-338a3fe01afb</cluster.start>
         <cluster.end>9c5dbfce-a6b9-5659-96bc-ca0cf429122a</cluster.end>
-        <image.publisher>microsoft_javaeeonazure_test</image.publisher>
-        <image.offer>2021-zheng-image-offer-preview</image.offer>
-        <image.sku>2021-zheng-rhel-with-websphere</image.sku>
+        <!-- This is the "Partner ID" in Partner Center" -->
+        <image.publisher>ibm-usa-ny-armonk-hq-6275750-ibmcloud-aiops</image.publisher>
+        <!-- This is the "Offer ID" of the "Azure Virtual Machine" offer type -->
+        <image.offer>2021-04-27-twas-cluster-base-image</image.offer>
+        <!-- This is the "Plan ID" of the plan within the "Azure Virtual Machine" offer -->
+        <image.sku>2021-04-27-twas-cluster-base-image</image.sku>
     </properties>
 </project>

src/main/arm/createUiDefinition.json

@@ -40,7 +40,7 @@
                 "type": "Microsoft.Common.InfoBox",
                 "options": {
                     "icon": "Info",
-                    "text": "Accept the IBM License Agreement to proceed with the deployment. <a href='https://www.ibm.com/software/sla/sladb.nsf/searchlis/?searchview&searchorder=4&searchmax=0&query=%225724-H88%22' target='_blank'>Learn more</a>"
+                    "text": "Accept the IBM License Agreement to proceed with the deployment. <a href='https://ibm.biz/tWASNDLicenseAzureVMs' target='_blank'>IBM WebSphere Application Server Network Deployment</a>."
                 }
             },
             {
@@ -52,6 +52,15 @@
                     "required": true,
                     "validationMessage": "The deployment will not proceed unless you accept the IBM License Agreement."
                 }
+            },
+            {
+                "name": "About",
+                "type": "Microsoft.Common.InfoBox",
+                "options": {
+                    "icon": "None",
+                    "text": "Template version ${project.version}"
+                },
+                "visible": "[bool('${template.version.visible}')]"
             }
         ],
         "steps": [
@@ -89,11 +98,11 @@
                         "type": "Microsoft.Common.TextBox",
                         "label": "Number of VMs",
                         "defaultValue": "4",
-                        "toolTip": "The number of virtual machines to create, with 1 deployment manager and 1 to 4 worker nodes.",
+                        "toolTip": "The number of virtual machines to create, with one deployment manager and one to four worker nodes.",
                         "constraints": {
                             "required": true,
                             "regex": "^(2|3|4|5)$",
-                            "validationMessage": "Number of virtual machines to deploy, limit 5 because this offer uses a single storage account."
+                            "validationMessage": "Please pick a value between 2 and 5. You need at least two virtual machines: one deployment manager and at least one worker node. The upper limit is five because this offer uses a single storage account."
                         }
                     },
                     {
@@ -222,7 +231,9 @@
                         },
                         "toolTip": "Password for WebSphere administrator.",
                         "constraints": {
-                            "required": true
+                            "required": true,
+                            "regex": "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)[A-Za-z\\d]{12,}$",
+                            "validationMessage": "The password must contain at least 12 characters, with at least 1 uppercase letter, 1 lowercase letter and 1 number, and special characters are not allowed."
                         }
                     }
                 ]