Skip to content

Commit

Permalink
cosmetic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@chkp-natanelm
chkp-natanelm committed Oct 6, 2024
1 parent 16c8fdf commit f8ca6b6
Show file tree
Hide file tree
Showing 20 changed files with 34 additions and 35 deletions.
Empty file removed .gitlab-ci.yml
View file
Empty file.
2 changes: 1 addition & 1 deletion azure/templates/README.MD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ To deploy a specific Azure image, adjust the image version during the manual dep
template_name: management
template_version: 20231002
template_type: marketplace
</details>
</details>
22 changes: 11 additions & 11 deletions azure/templates/marketplace-ha/createUiDefinition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,7 @@
"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": {
"constraints": {
"allowedValues": [
{
"label": "Yes",
Expand Down Expand Up @@ -1238,16 +1238,16 @@
"visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]"
},
{
"name": "Smart1CloudTokenB",
"type": "Microsoft.Common.TextBox",
"label": "Smart-1 Cloud Token Member B",
"toolTip": "Paste here the token copied from the Connect Gateway (Member B) screen in Smart-1 Cloud portal",
"constraints": {
"required": true,
"regex": "[\\S\\s]{5,}",
"validationMessage": "Smart1Cloud Token Should contain at lease 5 characters"
},
"visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]"
"name": "Smart1CloudTokenB",
"type": "Microsoft.Common.TextBox",
"label": "Smart-1 Cloud Token Member B",
"toolTip": "Paste here the token copied from the Connect Gateway (Member B) screen in Smart-1 Cloud portal",
"constraints": {
"required": true,
"regex": "[\\S\\s]{5,}",
"validationMessage": "Smart1Cloud Token Should contain at lease 5 characters"
},
"visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion azure/templates/marketplace-management/createUiDefinition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
}
},
{
"visible": "[bool(basics('auth').sshPublicKey)]",
"visible": "[bool(basics('auth').sshPublicKey)]",
"name": "EnableSerialConsolePassword",
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable Serial console password",
Expand Down
2 changes: 1 addition & 1 deletion azure/templates/marketplace-mds/createUiDefinition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
}
},
{
"visible": "[bool(basics('auth').sshPublicKey)]",
"visible": "[bool(basics('auth').sshPublicKey)]",
"name": "EnableSerialConsolePassword",
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable Serial console password",
Expand Down
10 changes: 5 additions & 5 deletions azure/templates/marketplace-single/createUiDefinition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@
}
},
{
"visible": "[bool(basics('auth').sshPublicKey)]",
"visible": "[bool(basics('auth').sshPublicKey)]",
"name": "EnableSerialConsolePassword",
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable Serial console password",
Expand Down Expand Up @@ -1120,7 +1120,7 @@
"label": "Quick connect to Smart-1 Cloud",
"defaultValue": "Yes",
"toolTip": "Automatically connect this single gateway to Smart-1 Cloud - Check Point's Security Management as a Service",
"constraints": {
"constraints": {
"allowedValues": [
{
"label": "Yes",
Expand Down Expand Up @@ -1157,7 +1157,7 @@
"validationMessage": "Smart1Cloud Token Should contain at lease 5 characters"
},
"visible": "[equals(steps('chkp').allowSmart1CloudConnection, 'yes')]"
}
}
]
},
{
Expand Down Expand Up @@ -1347,7 +1347,7 @@
"deployNewNSG": "[steps('network').NSG]",
"ExistingNSG": "[steps('network').nsgSelector]",
"NewNsgName": "[steps('network').NSGName]",
"addStorageAccountIpRules":"[steps('network').addStorageAccountIpRules]"
"addStorageAccountIpRules": "[steps('network').addStorageAccountIpRules]"
}
}
}
}
3 changes: 0 additions & 3 deletions azure/templates/marketplace-vmss-waap/mainTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,9 +661,6 @@
{
"type": "Microsoft.Storage/storageAccounts",
"name": "[variables('storageAccountName')]",
"properties": {
"minimalTlsVersion": "TLS1_2"
},
"apiVersion": "2021-04-01",
"location": "[variables('location')]",
"sku": {
Expand Down
4 changes: 2 additions & 2 deletions azure/templates/marketplace-vmss/createUiDefinition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@
}
},
{
"visible": "[bool(basics('auth').sshPublicKey)]",
"visible": "[bool(basics('auth').sshPublicKey)]",
"name": "EnableSerialConsolePassword",
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable Serial console password",
Expand Down Expand Up @@ -1749,4 +1749,4 @@
"MaintenanceModePasswordHash": "[steps('chkp').MaintenanceModePassword]"
}
}
}
}
2 changes: 1 addition & 1 deletion azure/templates/nestedtemplates/storageAccount-new.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts'), parameters('tagsByResource')['Microsoft.Storage/storageAccounts'], json('{}')) ]"
}
]
}
}
2 changes: 1 addition & 1 deletion azure/templates/nestedtemplates/vnet-1-subnet-existing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@
"type": "object"
}
}
}
}
2 changes: 1 addition & 1 deletion azure/templates/nestedtemplates/vnet-2-subnet-ha2-existing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@
"type": "array"
}
}
}
}
2 changes: 1 addition & 1 deletion azure/templates/nestedtemplates/vnet-2-subnet-ha2-new.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,4 @@
"type": "array"
}
}
}
}
2 changes: 1 addition & 1 deletion azure/templates/nestedtemplates/vnet-existing-stack-ha.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@
"type": "string"
}
}
}
}
2 changes: 1 addition & 1 deletion azure/templates/nestedtemplates/vnet-existing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@
"type": "string"
}
}
}
}
2 changes: 1 addition & 1 deletion azure/templates/nestedtemplates/vnet-new-stack-ha.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,4 @@
"type": "string"
}
}
}
}
2 changes: 1 addition & 1 deletion azure/templates/vwan-managed-app/mainTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,4 +281,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion deprecated/azure/templates/R8040-R81/single-ipv6-r8040-r81/mainTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"R81 - Pay As You Go (NGTP)",
"R81 - Pay As You Go (NGTX)"
],
"defaultValue": "R81.20 - Bring Your Own License",
"defaultValue": "R81 - Bring Your Own License",
"metadata": {
"description": "Version of Check Point CloudGuard"
}
Expand Down
2 changes: 1 addition & 1 deletion deprecated/azure/templates/stack-R8040-R81/stack-single-r8040-r81/mainTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
"R80.40 - Pay As You Go (NGTX)": "NGTX",
"R81 - Bring Your Own License": "BYOL",
"R81 - Pay As You Go (NGTP)": "NGTP",
"R81 - Pay As You Go (NGTX)": "NGTX",
"R81 - Pay As You Go (NGTX)": "NGTX"
},
"offer": "[variables('offers')[parameters('cloudGuardVersion')]]",
"osVersions": {
Expand Down
2 changes: 2 additions & 0 deletions terraform/azure/single-gateway-new-vnet/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ In order to check the template version refer to the [sk116585](https://supportce

| Template Version | Description |
|------------------|---------------------------------------------------------------------------------------------------|
| 20240613 | - Updated Azure Terraform provider version <br> - Cosmetic fixes & default values <br> - Added option to limit storage account access by specify allowed sourcess <br> - Added accelerated networking to SGW Terraform templates <br> - Updated Public IP sku to Standard <br> - Added validation for os_version & os_offer |
| | | |
| 20230910 | - R81.20 is the default version |
| | | |
| 20230629 | First release of Check Point CloudGuard Network Security Single GW Terraform deployment for Azure |
Expand Down
2 changes: 1 addition & 1 deletion terraform/gcp/high-availability/locals.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ locals {
// will fail if the var.zoneA and var.zoneB are not at the same region:
validate_zones = index(local.split_zoneA, local.split_zoneB[0]) == local.split_zoneA[0] && index(local.split_zoneA, local.split_zoneB[1]) == local.split_zoneA[0] ? 0 : "var.zoneA and var.zoneB are not at the same region"

regex_valid_management_network = "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(/(3[0-2]|2[0-9]|1[0-9]|[0-9]))|(S1C)$"
regex_valid_management_network = "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(/(3[0-2]|2[0-9]|1[0-9]|[0-9]))|(S1C)$"
// Will fail if var.management_network is invalid
regex_management_network = regex(local.regex_valid_management_network, var.management_network) == var.management_network ? 0 : "Variable [management_network] must be a valid address in CIDR notation or S1C."

Expand Down

0 comments on commit f8ca6b6

Please sign in to comment.