From 20a414036fb6d02c54c3c505a37b5c2b7796ac2f Mon Sep 17 00:00:00 2001 From: natanelm Date: Wed, 5 Feb 2025 15:28:25 +0000 Subject: [PATCH] Azure Templates | Revert SIC configuration for Smart-1 Cloud --- .../marketplace-ha/createUiDefinition.json | 62 +++++++++---------- .../marketplace-ha/mainTemplate.json | 1 - .../createUiDefinition.json | 61 +++++++++--------- .../marketplace-single/mainTemplate.json | 1 - 4 files changed, 61 insertions(+), 64 deletions(-) diff --git a/azure/templates/marketplace-ha/createUiDefinition.json b/azure/templates/marketplace-ha/createUiDefinition.json index 0daf4fb1..cd31c107 100644 --- a/azure/templates/marketplace-ha/createUiDefinition.json +++ b/azure/templates/marketplace-ha/createUiDefinition.json @@ -1143,28 +1143,46 @@ "count": 2 }, { - "name": "ManagementConnection", - "type": "Microsoft.Common.OptionsGroup", - "label": "Choose Management Option", - "defaultValue": "Connect the security GW to my SaaS management (Smart1-Cloud)", - "toolTip": "Automatically connect this single gateway to Smart-1 Cloud - Check Point's Security Management as a Service", + "name": "sicKeyUi", + "type": "Microsoft.Common.PasswordBox", + "label": { + "password": "SIC key", + "confirmPassword": "Confirm SIC key" + }, + "toolTip": "Set the Secure Internal Communication one time secret used to set up trust between the cluster object and the management server.", "constraints": { + "required": true, + "regex": "^[a-z0-9A-Z]{12,30}$", + "validationMessage": "Only alphanumeric characters are allowed, and the value must be 12-30 characters long." + }, + "options": { + "hideConfirmation": false + } + }, + { + "name": "allowSmart1CloudConnection", + "type": "Microsoft.Common.OptionsGroup", + "label": "Quick connect to Smart-1 Cloud", + "defaultValue": "Yes", + "toolTip": "Automatically connect this Cluster to Smart-1 Cloud - Check Point's Security Management as a Service", + "constraints": { "allowedValues": [ { - "label": "Connect the security GW to my SaaS management (Smart1-Cloud)", - "value": "Connect the security GW to my SaaS management (Smart1-Cloud)" + "label": "Yes", + "value": "yes" }, { - "label": "Connect the security GW to my IaaS management", - "value": "Connect the security GW to my IaaS management" + "label": "No", + "value": "no" } ] - } + }, + "visible": true }, { "name": "InfoS1C", "type": "Microsoft.Common.InfoBox", - "visible": "[equals(steps('chkp').ManagementConnection, 'Connect the security GW to my SaaS management (Smart1-Cloud)')]", + "visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]", "options": { "icon": "Info", "text": "Follow these instructions to quickly connect this Cluster to Smart-1 Cloud
sk180501-Connecting CloudGuard Network Security Public Cloud Gateway to Smart-1 Cloud." @@ -1180,7 +1198,7 @@ "regex": "[\\S\\s]{5,}", "validationMessage": "Smart1Cloud Token Should contain at lease 5 characters" }, - "visible": "[equals(steps('chkp').ManagementConnection, 'Connect the security GW to my SaaS management (Smart1-Cloud)')]" + "visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]" }, { "name": "Smart1CloudTokenB", @@ -1192,25 +1210,7 @@ "regex": "[\\S\\s]{5,}", "validationMessage": "Smart1Cloud Token Should contain at lease 5 characters" }, - "visible": "[equals(steps('chkp').ManagementConnection, 'Connect the security GW to my SaaS management (Smart1-Cloud)')]" - }, - { - "name": "sicKeyUi", - "type": "Microsoft.Common.PasswordBox", - "label": { - "password": "SIC key", - "confirmPassword": "Confirm SIC key" - }, - "toolTip": "Set the Secure Internal Communication one time secret used to set up trust between the cluster object and the management server.", - "constraints": { - "required": true, - "regex": "^[a-z0-9A-Z]{12,30}$", - "validationMessage": "Only alphanumeric characters are allowed, and the value must be 12-30 characters long." - }, - "options": { - "hideConfirmation": false - }, - "visible": "[equals(steps('chkp').ManagementConnection, 'Connect the security GW to my IaaS management')]" + "visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]" } ] }, diff --git a/azure/templates/marketplace-ha/mainTemplate.json b/azure/templates/marketplace-ha/mainTemplate.json index 6169e448..e1cbb6b1 100644 --- a/azure/templates/marketplace-ha/mainTemplate.json +++ b/azure/templates/marketplace-ha/mainTemplate.json @@ -135,7 +135,6 @@ }, "sicKey": { "type": "securestring", - "defaultValue": "", "metadata": { "description": "One time key for Secure Internal Communication" } diff --git a/azure/templates/marketplace-single/createUiDefinition.json b/azure/templates/marketplace-single/createUiDefinition.json index d5ad1525..7d4dc503 100644 --- a/azure/templates/marketplace-single/createUiDefinition.json +++ b/azure/templates/marketplace-single/createUiDefinition.json @@ -1143,32 +1143,49 @@ "count": 1 }, { - "name": "ManagementConnection", - "type": "Microsoft.Common.OptionsGroup", - "label": "Choose Management Option", - "defaultValue": "Connect the security GW to my SaaS management (Smart1-Cloud)", - "toolTip": "Automatically connect this single gateway to Smart-1 Cloud - Check Point's Security Management as a Service", + "name": "sicKeyUi", + "type": "Microsoft.Common.PasswordBox", + "label": { + "password": "SIC key", + "confirmPassword": "Confirm SIC key" + }, + "toolTip": "Set the Secure Internal Communication one time secret used to set up trust between the cluster object and the management server.", "constraints": { + "required": true, + "regex": "^[a-z0-9A-Z]{12,30}$", + "validationMessage": "Only alphanumeric characters are allowed, and the value must be 12-30 characters long." + }, + "options": { + "hideConfirmation": false + } + }, + { + "name": "allowSmart1CloudConnection", + "type": "Microsoft.Common.OptionsGroup", + "label": "Quick connect to Smart-1 Cloud", + "defaultValue": "Yes", + "toolTip": "Automatically connect this Cluster to Smart-1 Cloud - Check Point's Security Management as a Service", + "constraints": { "allowedValues": [ { - "label": "Connect the security GW to my SaaS management (Smart1-Cloud)", - "value": "Connect the security GW to my SaaS management (Smart1-Cloud)" + "label": "Yes", + "value": "yes" }, { - "label": "Connect the security GW to my IaaS management", - "value": "Connect the security GW to my IaaS management" + "label": "No", + "value": "no" } ] }, - "visible": "[equals(steps('chkp-advanced').installationType, 'gateway')]" + "visible": true }, { "name": "InfoS1C", "type": "Microsoft.Common.InfoBox", - "visible": "[equals(steps('chkp').ManagementConnection, 'Connect the security GW to my SaaS management (Smart1-Cloud)')]", + "visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]", "options": { "icon": "Info", - "text": "Connect the security GW to my SaaS management (Smart1-Cloud)
sk180501-Connecting CloudGuard Network Security Public Cloud Gateway to Smart-1 Cloud." + "text": "Follow these instructions to quickly connect this Cluster to Smart-1 Cloud
sk180501-Connecting CloudGuard Network Security Public Cloud Gateway to Smart-1 Cloud." } }, { @@ -1181,25 +1198,7 @@ "regex": "[\\S\\s]{5,}", "validationMessage": "Smart1Cloud Token Should contain at lease 5 characters" }, - "visible": "[equals(steps('chkp').ManagementConnection, 'Connect the security GW to my SaaS management (Smart1-Cloud)')]" - }, - { - "name": "sicKeyUi", - "type": "Microsoft.Common.PasswordBox", - "label": { - "password": "SIC key", - "confirmPassword": "Confirm SIC key" - }, - "toolTip": "Set the Secure Internal Communication one time secret used to set up trust between the gateway and the management server.", - "constraints": { - "required": true, - "regex": "^[a-z0-9A-Z]{12,30}$", - "validationMessage": "Only alphanumeric characters are allowed, and the value must be 12-30 characters long." - }, - "options": { - "hideConfirmation": false - }, - "visible": "[and(not(equals(steps('chkp-advanced').installationType, 'standalone')),equals(steps('chkp').ManagementConnection, 'Connect the security GW to my IaaS management'))]" + "visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]" } ] }, diff --git a/azure/templates/marketplace-single/mainTemplate.json b/azure/templates/marketplace-single/mainTemplate.json index 0197c979..3fdbb7d9 100644 --- a/azure/templates/marketplace-single/mainTemplate.json +++ b/azure/templates/marketplace-single/mainTemplate.json @@ -101,7 +101,6 @@ }, "sicKey": { "type": "securestring", - "defaultValue": "", "metadata": { "description": "One time key for Secure Internal Communication" }