diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 43f77eb..35a6b45 100644 --- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json @@ -132,7 +132,7 @@ "name": "artifactoryVersion", "type": "Microsoft.Common.DropDown", "label": "Artifactory-vm image version to deploy.", - "defaultValue": "7.29.8", + "defaultValue": "7.37.14", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -140,85 +140,101 @@ "label": "7.12.5", "value": "0.0.8" }, - { + { "label": "7.12.6", "value": "0.0.9" }, { "label": "7.12.8", - "value": "0.0.10" - }, - { + "value": "0.0.10" + }, + { "label": "7.15.3", - "value": "0.0.11" - }, - { + "value": "0.0.11" + }, + { "label": "7.15.4", "value": "0.0.12" }, - { - "label": "7.17.4", - "value": "0.0.14" - }, - { - "label": "7.17.5", - "value": "0.0.15" - }, - { - "label": "7.18.6", - "value": "0.0.18" - }, - { - "label": "7.19.4", - "value": "0.0.19" - }, - { - "label": "7.21.3", - "value": "0.0.21" - }, - { - "label": "7.21.8", - "value": "0.0.22" - }, - { - "label": "7.21.12", - "value": "0.0.23" - }, - { - "label": "7.24.3", - "value": "0.0.25" - }, - { - "label": "7.25.6", - "value": "0.0.27" - }, - { - "label": "7.25.7", - "value": "0.0.28" - }, - { - "label": "7.27.3", - "value": "0.0.29" - }, - { - "label": "7.27.6", - "value": "0.0.30" - }, - { - "label": "7.27.9", - "value": "0.0.32" - }, - { - "label": "7.27.10", - "value": "0.0.33" - }, - { - "label": "7.29.7", - "value": "0.0.34" - }, - { + { + "label": "7.17.4", + "value": "0.0.14" + }, + { + "label": "7.17.5", + "value": "0.0.15" + }, + { + "label": "7.18.6", + "value": "0.0.18" + }, + { + "label": "7.19.4", + "value": "0.0.19" + }, + { + "label": "7.21.3", + "value": "0.0.21" + }, + { + "label": "7.21.8", + "value": "0.0.22" + }, + { + "label": "7.21.12", + "value": "0.0.23" + }, + { + "label": "7.24.3", + "value": "0.0.25" + }, + { + "label": "7.25.6", + "value": "0.0.27" + }, + { + "label": "7.25.7", + "value": "0.0.28" + }, + { + "label": "7.27.3", + "value": "0.0.29" + }, + { + "label": "7.27.6", + "value": "0.0.30" + }, + { + "label": "7.27.9", + "value": "0.0.32" + }, + { + "label": "7.27.10", + "value": "0.0.33" + }, + { + "label": "7.29.7", + "value": "0.0.34" + }, + { "label": "7.29.8", "value": "0.0.35" + }, + { + "label": "7.33.9", + "value": "0.0.37" + }, + { + "label": "7.33.12", + "value": "0.0.38" + }, + { + "label": "7.35.2", + "value": "0.0.39" + }, + { + "label": "7.37.14", + "value": "0.0.40" } ], "required": true @@ -232,11 +248,11 @@ "password": "Artifactory master Key", "confirmPassword": "Confirm master Key" }, - "toolTip": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 16'", + "toolTip": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 32'", "constraints": { "required": true, - "regex": "^[a-z0-9A-Z]{12,32}$", - "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." + "regex": "^[a-z0-9A-Z]{12,64}$", + "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long." }, "options": { "hideConfirmation": true @@ -249,11 +265,11 @@ "password": "Artifactory join Key", "confirmPassword": "Confirm join Key" }, - "toolTip": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 16'", + "toolTip": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 32'", "constraints": { "required": false, - "regex": "^[a-z0-9A-Z]{12,32}$", - "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." + "regex": "^[a-z0-9A-Z]{12,64}$", + "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long." }, "options": { "hideConfirmation": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index db31bff..6ef521c 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,29 +79,33 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.35", + "defaultValue": "0.0.40", "allowedValues": [ - "0.0.8", - "0.0.9", - "0.0.10", - "0.0.11", - "0.0.12", - "0.0.14", - "0.0.15", - "0.0.18", - "0.0.19", - "0.0.21", - "0.0.22", - "0.0.23", - "0.0.25", - "0.0.27", - "0.0.28", - "0.0.29", - "0.0.30", - "0.0.32", - "0.0.33", - "0.0.34", - "0.0.35" + "0.0.8", + "0.0.9", + "0.0.10", + "0.0.11", + "0.0.12", + "0.0.14", + "0.0.15", + "0.0.18", + "0.0.19", + "0.0.21", + "0.0.22", + "0.0.23", + "0.0.25", + "0.0.27", + "0.0.28", + "0.0.29", + "0.0.30", + "0.0.32", + "0.0.33", + "0.0.34", + "0.0.35", + "0.0.37", + "0.0.38", + "0.0.39", + "0.0.40" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -175,7 +179,7 @@ }, "certificateKey": { "type": "securestring", - "metadata": { + "metadata": { "description": "Provide your SSL Certificate key" } }, @@ -183,7 +187,7 @@ "type": "string", "minLength": 1, "defaultValue": "artifactory", - "metadata": { + "metadata": { "description": "Provide your Certificate Domain Name. For e.g jfrog.team for certificate with *.jfrog.team" } }, @@ -191,7 +195,7 @@ "type": "string", "minLength": 1, "defaultValue": "artifactory", - "metadata": { + "metadata": { "description": "Provide artifactory server name to be used in Nginx. e.g artifactory for artifactory.jfrog.team" } }, @@ -199,7 +203,7 @@ "type": "string", "minLength": 1, "defaultValue": "-server -Xms2g -Xmx8g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\"kill -9 %p\\\"", - "metadata": { + "metadata": { "description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware." } }, @@ -323,7 +327,7 @@ }, "resources": [ { - "apiVersion": "2020-06-01", + "apiVersion": "2021-12-01", "name": "pid-9cc90849-b021-4272-a33f-1922bd5c0f99-partnercenter", "type": "Microsoft.Resources/deployments", "properties": { @@ -340,7 +344,7 @@ "type": "Microsoft.Network/networkSecurityGroups", "location": "[parameters('location')]", "name": "[variables('nsgName')]", - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "properties": { "securityRules": [ { @@ -420,7 +424,7 @@ "type": "Microsoft.Network/virtualNetworks", "name": "[variables('virtualNetworkName')]", "location": "[parameters('location')]", - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "dependsOn": [ "[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]" ], @@ -453,7 +457,7 @@ } }, { - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "type": "Microsoft.Network/networkInterfaces", "name": "[variables('nicPrimaryName')]", "location": "[parameters('location')]", @@ -480,7 +484,7 @@ } }, { - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "type": "Microsoft.Network/networkInterfaces", "name": "[variables('nicMemberName')]", "location": "[parameters('location')]", @@ -513,7 +517,7 @@ "sku": { "name": "Standard" }, - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "properties": { "publicIPAllocationMethod": "Static", "dnsSettings": { @@ -528,7 +532,7 @@ "sku": { "name": "Standard" }, - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "properties": { "publicIPAllocationMethod": "Static", "dnsSettings": { @@ -540,7 +544,7 @@ "type": "Microsoft.Network/loadBalancers", "name": "[variables('lbName')]", "location": "[parameters('location')]", - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "sku": { "name": "Standard" }, @@ -548,7 +552,7 @@ "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]", "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]" ], - "tags":{ + "tags": { "displayName": "Load Balancer" }, "properties": { @@ -736,7 +740,7 @@ "sku": { "name": "[parameters('storageAccountType')]" }, - "tags":{ + "tags": { "displayName": "Artifactory Storage Account" }, "kind": "Storage", @@ -820,7 +824,7 @@ "computerNamePrefix": "[variables('namingInfix')]", "adminUsername": "[parameters('adminUsername')]", "adminPassword": "[parameters('adminPassword')]", - "customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2018-07-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','true','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]" + "customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2021-09-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','true','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]" }, "networkProfile": { "networkInterfaceConfigurations": [ @@ -917,7 +921,7 @@ "computerNamePrefix": "[variables('namingInfix')]", "adminUsername": "[parameters('adminUsername')]", "adminPassword": "[parameters('adminPassword')]", - "customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2018-07-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','false','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]" + "customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2021-09-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','false','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]" }, "networkProfile": { "networkInterfaceConfigurations": [ @@ -976,7 +980,7 @@ ], "outputs": { "fqdn": { - "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses',variables('pipMemberName')),'2018-07-01').dnsSettings.fqdn]", + "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses',variables('pipMemberName')),'2021-12-01').dnsSettings.fqdn]", "type": "string" } } diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 3299b13..5cf92e3 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -79,29 +79,33 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.35", + "defaultValue": "0.0.40", "allowedValues": [ - "0.0.8", - "0.0.9", - "0.0.10", - "0.0.11", - "0.0.12", - "0.0.14", - "0.0.15", - "0.0.18", - "0.0.19", - "0.0.21", - "0.0.22", - "0.0.23", - "0.0.25", - "0.0.27", - "0.0.28", - "0.0.29", - "0.0.30", - "0.0.32", - "0.0.33", - "0.0.34", - "0.0.35" + "0.0.8", + "0.0.9", + "0.0.10", + "0.0.11", + "0.0.12", + "0.0.14", + "0.0.15", + "0.0.18", + "0.0.19", + "0.0.21", + "0.0.22", + "0.0.23", + "0.0.25", + "0.0.27", + "0.0.28", + "0.0.29", + "0.0.30", + "0.0.32", + "0.0.33", + "0.0.34", + "0.0.35", + "0.0.37", + "0.0.38", + "0.0.39", + "0.0.40" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -111,14 +115,14 @@ "type": "securestring", "maxLength": 64, "metadata": { - "description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 16'" + "description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 32'" } }, "joinKey": { "type": "securestring", "maxLength": 64, "metadata": { - "description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 16'" + "description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 32'" } }, "adminUsername": { @@ -175,7 +179,7 @@ }, "certificateKey": { "type": "securestring", - "metadata": { + "metadata": { "description": "Provide your SSL Certificate key" } }, @@ -183,7 +187,7 @@ "type": "string", "minLength": 1, "defaultValue": "artifactory", - "metadata": { + "metadata": { "description": "Provide your Certificate Domain Name. For e.g jfrog.team for certificate with *.jfrog.team" } }, @@ -191,7 +195,7 @@ "type": "string", "minLength": 1, "defaultValue": "artifactory", - "metadata": { + "metadata": { "description": "Provide artifactory server name to be used in Nginx. e.g artifactory for artifactory.jfrog.team" } }, @@ -199,7 +203,7 @@ "type": "string", "minLength": 1, "defaultValue": "-server -Xms2g -Xmx8g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\"kill -9 %p\\\"", - "metadata": { + "metadata": { "description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware." } }, @@ -534,7 +538,7 @@ "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]", "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]" ], - "tags":{ + "tags": { "displayName": "Load Balancer" }, "properties": { @@ -722,7 +726,7 @@ "sku": { "name": "[parameters('storageAccountType')]" }, - "tags":{ + "tags": { "displayName": "Artifactory Storage Account" }, "kind": "Storage", diff --git a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json index 0503514..0f8a6ff 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json @@ -1,5 +1,5 @@ { - "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "location": { diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index c9f9ffb..11dfd92 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -123,7 +123,7 @@ "name": "xrayVersion", "type": "Microsoft.Common.DropDown", "label": "Xray-vm image version to deploy.", - "defaultValue": "3.38.2", + "defaultValue": "3.42.5", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -176,36 +176,44 @@ "value": "0.0.24" }, { - "label": "3.29.0", + "label": "3.29.0", "value": "0.0.25" - }, - { - "label": "3.29.2", - "value": "0.0.26" - }, - { - "label": "3.32.2", - "value": "0.0.27" - }, - { - "label": "3.33.3", - "value": "0.0.28" - }, - { - "label": "3.34.1", - "value": "0.0.29" - }, - { - "label": "3.35.0", - "value": "0.0.30" - }, - { - "label": "3.37.2", - "value": "0.0.31" - }, - { + }, + { + "label": "3.29.2", + "value": "0.0.26" + }, + { + "label": "3.32.2", + "value": "0.0.27" + }, + { + "label": "3.33.3", + "value": "0.0.28" + }, + { + "label": "3.34.1", + "value": "0.0.29" + }, + { + "label": "3.35.0", + "value": "0.0.30" + }, + { + "label": "3.37.2", + "value": "0.0.31" + }, + { "label": "3.38.2", "value": "0.0.32" + }, + { + "label": "3.41.4", + "value": "0.0.33" + }, + { + "label": "3.42.5", + "value": "0.0.34" } ], "required": true @@ -219,11 +227,11 @@ "password": "Xray master Key", "confirmPassword": "Confirm master Key" }, - "toolTip": "Master key for Xray instance. Generate master.key using command '$openssl rand -hex 16'", + "toolTip": "Master key for Xray instance. Generate master.key using command '$openssl rand -hex 32'", "constraints": { "required": true, - "regex": "^[a-z0-9A-Z]{12,32}$", - "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." + "regex": "^[a-z0-9A-Z]{12,64}$", + "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long." }, "options": { "hideConfirmation": true @@ -239,8 +247,8 @@ "toolTip": "Join key from Artifactory cluster. You can copy Join key from the Artifactory UI, Security -> Settings -> Connection details", "constraints": { "required": true, - "regex": "^[a-z0-9A-Z]{12,32}$", - "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." + "regex": "^[a-z0-9A-Z]{12,64}$", + "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long." }, "options": { "hideConfirmation": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 1c88c6e..d790a95 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -19,7 +19,7 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.32", + "defaultValue": "0.0.34", "allowedValues": [ "0.0.10", "0.0.11", @@ -34,13 +34,15 @@ "0.0.23", "0.0.24", "0.0.25", - "0.0.26", - "0.0.27", - "0.0.28", - "0.0.29", - "0.0.30", - "0.0.31", - "0.0.32" + "0.0.26", + "0.0.27", + "0.0.28", + "0.0.29", + "0.0.30", + "0.0.31", + "0.0.32", + "0.0.33", + "0.0.34" ], "metadata": { "description": "Xray-vm image version to deploy." diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index 51308d0..956f395 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json +++ b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json @@ -33,7 +33,7 @@ "value": "10.0.1.0/24" }, "xrayVersion": { - "value": "0.0.32" + "value": "0.0.34" }, "artifactoryURL": { "value": "http://ARTIFACTORY-URL.cloudapp.azure.com" diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index af3f90a..15ef84b 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -19,7 +19,7 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.32", + "defaultValue": "0.0.34", "allowedValues": [ "0.0.10", "0.0.11", @@ -34,13 +34,15 @@ "0.0.23", "0.0.24", "0.0.25", - "0.0.26", - "0.0.27", - "0.0.28", - "0.0.29", - "0.0.30", - "0.0.31", - "0.0.32" + "0.0.26", + "0.0.27", + "0.0.28", + "0.0.29", + "0.0.30", + "0.0.31", + "0.0.32", + "0.0.33", + "0.0.34" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -56,14 +58,14 @@ "type": "securestring", "maxLength": 64, "metadata": { - "description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 16'" + "description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 32'" } }, "joinKey": { "type": "securestring", "maxLength": 64, "metadata": { - "description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 16'" + "description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 32'" } }, "adminUsername": { diff --git a/AzureResourceManager/Xray/vm_install/vm_deploy.json b/AzureResourceManager/Xray/vm_install/vm_deploy.json index 47e23a7..35042ec 100644 --- a/AzureResourceManager/Xray/vm_install/vm_deploy.json +++ b/AzureResourceManager/Xray/vm_install/vm_deploy.json @@ -1,5 +1,5 @@ { - "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "$schema": "http://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "location": { @@ -70,7 +70,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/vm-image-templates/AzureResourceManager/Xray/" + "defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/master/AzureResourceManager/Xray/" }, "_artifactsLocationSasToken": { "type": "securestring", @@ -259,4 +259,4 @@ "value": "[variables('commandToExecute')]" } } -} \ No newline at end of file +}