From 3ec339a5d904e51de82b9f296be17d45e2de560e Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 10 Feb 2022 13:37:05 +0530 Subject: [PATCH 01/24] version updated for RT and Xray --- .../Artifactory/vm_install/vm_parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 16b1a74..aa452ee 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "OWERWRITE_THE_PASSWORD" + "value": "Password!123" }, "artifactoryVersion": { - "value": "OWERWRITE_LATEST_VERSION" + "value": "7.33.9" }, "scriptName": { "value": "install_pro7_to_vm.sh" From 16e44520b208dbf0776a51e9c08e2e3248bb7fc7 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 10 Feb 2022 13:37:30 +0530 Subject: [PATCH 02/24] version updated for RT and Xray --- AzureResourceManager/Xray/vm_install/vm_deploy.json | 4 ++-- AzureResourceManager/Xray/vm_install/vm_parameters.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AzureResourceManager/Xray/vm_install/vm_deploy.json b/AzureResourceManager/Xray/vm_install/vm_deploy.json index 47e23a7..eef02c2 100644 --- a/AzureResourceManager/Xray/vm_install/vm_deploy.json +++ b/AzureResourceManager/Xray/vm_install/vm_deploy.json @@ -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 +} diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json index e9b0674..a5ac44b 100644 --- a/AzureResourceManager/Xray/vm_install/vm_parameters.json +++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "OWERWRITE_THE_PASSWORD" + "value": "Password!123" }, "xrayVersion": { - "value": "OWERWRITE_LATEST_VERSION" + "value": "3.41.4" }, "scriptName": { "value": "install_xray_to_vm.sh" From c4c665642abe3fb8d19d36fa625720a1db92b2bc Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Fri, 11 Feb 2022 14:47:50 +0530 Subject: [PATCH 03/24] update artifactory version --- .../Artifactory/MP_submission/createUiDefinition.json | 8 ++++++-- .../Artifactory/MP_submission/mainTemplate.json | 5 +++-- AzureResourceManager/Artifactory/azuredeploy.json | 3 ++- .../Artifactory/vm_install/vm_parameters.json | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 43f77eb..0c68548 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.33.9", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -219,7 +219,11 @@ { "label": "7.29.8", "value": "0.0.35" - } + }, + { + "label": "7.33.9", + "value: "0.0.37" + } ], "required": true }, diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index db31bff..eed000f 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.35", + "defaultValue": "0.0.37", "allowedValues": [ "0.0.8", "0.0.9", @@ -101,7 +101,8 @@ "0.0.32", "0.0.33", "0.0.34", - "0.0.35" + "0.0.35", + "0.0.37" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 3299b13..001ad58 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -101,7 +101,8 @@ "0.0.32", "0.0.33", "0.0.34", - "0.0.35" + "0.0.35", + "0.0.37" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index aa452ee..16b1a74 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "Password!123" + "value": "OWERWRITE_THE_PASSWORD" }, "artifactoryVersion": { - "value": "7.33.9" + "value": "OWERWRITE_LATEST_VERSION" }, "scriptName": { "value": "install_pro7_to_vm.sh" From ffe79d51d34f423574658578df80670e74116cef Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Fri, 11 Feb 2022 14:51:12 +0530 Subject: [PATCH 04/24] update artifactory version --- .../Artifactory/MP_submission/createUiDefinition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 0c68548..18db030 100644 --- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json @@ -222,7 +222,7 @@ }, { "label": "7.33.9", - "value: "0.0.37" + "value": "0.0.37" } ], "required": true From cec955118397c848919fd7e28e641ed8f928b107 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Fri, 11 Feb 2022 16:24:09 +0530 Subject: [PATCH 05/24] updated Artifactory version --- .../Xray/MP_submission/createUiDefinition.json | 6 +++++- AzureResourceManager/Xray/MP_submission/mainTemplate.json | 5 +++-- AzureResourceManager/Xray/azuredeploy_xray.parameters.json | 2 +- AzureResourceManager/Xray/azuredeploy_xray_vmss.json | 5 +++-- AzureResourceManager/Xray/vm_install/vm_parameters.json | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index c9f9ffb..8c96c2e 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -206,7 +206,11 @@ { "label": "3.38.2", "value": "0.0.32" - } + }, + { + "label": "3.41.4", + "value": "0.0.33" + } ], "required": true }, diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 1c88c6e..c8039a8 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.33", "allowedValues": [ "0.0.10", "0.0.11", @@ -40,7 +40,8 @@ "0.0.29", "0.0.30", "0.0.31", - "0.0.32" + "0.0.32", + "0.0.33" ], "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..3837de2 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.33" }, "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..7eb46b9 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.33", "allowedValues": [ "0.0.10", "0.0.11", @@ -40,7 +40,8 @@ "0.0.29", "0.0.30", "0.0.31", - "0.0.32" + "0.0.32", + "0.0.33" ], "metadata": { "description": "Xray-vm image version to deploy." diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json index a5ac44b..e9b0674 100644 --- a/AzureResourceManager/Xray/vm_install/vm_parameters.json +++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "Password!123" + "value": "OWERWRITE_THE_PASSWORD" }, "xrayVersion": { - "value": "3.41.4" + "value": "OWERWRITE_LATEST_VERSION" }, "scriptName": { "value": "install_xray_to_vm.sh" From d75bf26ac3720b4e71afedca2a24754affb37817 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 15 Feb 2022 12:19:44 +0530 Subject: [PATCH 06/24] RT version 7.34.4 --- .../Artifactory/vm_install/vm_parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 16b1a74..2a2b6c1 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "OWERWRITE_THE_PASSWORD" + "value": "7.34.4" }, "artifactoryVersion": { - "value": "OWERWRITE_LATEST_VERSION" + "value": "Password!123" }, "scriptName": { "value": "install_pro7_to_vm.sh" From f308384cb902d7a53b1d11d8e90a5fad89b8db18 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 15 Feb 2022 12:27:12 +0530 Subject: [PATCH 07/24] RT new version 7.34.4 updated --- .../Artifactory/vm_install/vm_parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 2a2b6c1..1ce73bd 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "7.34.4" + "value": "Password!123" }, "artifactoryVersion": { - "value": "Password!123" + "value": "7.34.4" }, "scriptName": { "value": "install_pro7_to_vm.sh" From 0502c354940678532333f0a5ee2974f738e04fc7 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 15 Feb 2022 23:36:20 +0530 Subject: [PATCH 08/24] changed into Previous RT version 7.33.9 --- AzureResourceManager/Artifactory/vm_install/vm_parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 1ce73bd..aa452ee 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -90,7 +90,7 @@ "value": "Password!123" }, "artifactoryVersion": { - "value": "7.34.4" + "value": "7.33.9" }, "scriptName": { "value": "install_pro7_to_vm.sh" From b7bf3f132ed34388a4de92f58e4a6a61445ba925 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 24 Feb 2022 13:30:25 +0530 Subject: [PATCH 09/24] RT version 7.33.12 --- AzureResourceManager/Artifactory/vm_install/vm_parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index aa452ee..a689bd8 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -90,7 +90,7 @@ "value": "Password!123" }, "artifactoryVersion": { - "value": "7.33.9" + "value": "7.33.12" }, "scriptName": { "value": "install_pro7_to_vm.sh" From c618ae5901c5bc30316cbf2789ab0bbebc1277c7 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 24 Feb 2022 17:00:22 +0530 Subject: [PATCH 10/24] Updated new RT version and vm version --- .../Artifactory/MP_submission/createUiDefinition.json | 6 +++++- .../Artifactory/MP_submission/mainTemplate.json | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 18db030..f4ce877 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.33.9", + "defaultValue": "7.33.12", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -223,6 +223,10 @@ { "label": "7.33.9", "value": "0.0.37" + }, + { + "label": "7.33.12", + "value": "0.0.38" } ], "required": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index eed000f..a3ef05c 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.37", + "defaultValue": "0.0.38", "allowedValues": [ "0.0.8", "0.0.9", @@ -102,7 +102,8 @@ "0.0.33", "0.0.34", "0.0.35", - "0.0.37" + "0.0.37", + "0.0.38" ], "metadata": { "description": "Artifactory-vm image version to deploy." From 15da85cbc425bd4f79ccc3e3d356a8f285ebcf8e Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 24 Feb 2022 17:17:03 +0530 Subject: [PATCH 11/24] Update Xray version and VM version --- .../Xray/MP_submission/createUiDefinition.json | 6 +++++- AzureResourceManager/Xray/MP_submission/mainTemplate.json | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index 8c96c2e..1223726 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": [ @@ -210,6 +210,10 @@ { "label": "3.41.4", "value": "0.0.33" + }, + { + "label": "3.42.5", + "value": "0.0.34" } ], "required": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index c8039a8..04afc7d 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.33", + "defaultValue": "0.0.34", "allowedValues": [ "0.0.10", "0.0.11", @@ -41,7 +41,8 @@ "0.0.30", "0.0.31", "0.0.32", - "0.0.33" + "0.0.33", + "0.0.34" ], "metadata": { "description": "Xray-vm image version to deploy." From 159e94e3507c1bf5621b6b5189be8ff3a2557fb8 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Wed, 6 Apr 2022 12:38:14 +0530 Subject: [PATCH 12/24] RT version updated --- AzureResourceManager/Artifactory/vm_install/vm_parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index a689bd8..4d94570 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -90,7 +90,7 @@ "value": "Password!123" }, "artifactoryVersion": { - "value": "7.33.12" + "value": "7.35.2" }, "scriptName": { "value": "install_pro7_to_vm.sh" From 21c61b3f7a58315f0abd763e11ad80287c7093c4 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Wed, 6 Apr 2022 17:35:58 +0530 Subject: [PATCH 13/24] Xray version updated --- AzureResourceManager/Xray/vm_install/vm_parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json index e9b0674..ffd11e4 100644 --- a/AzureResourceManager/Xray/vm_install/vm_parameters.json +++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "OWERWRITE_THE_PASSWORD" + "value": "Password!123" }, "xrayVersion": { - "value": "OWERWRITE_LATEST_VERSION" + "value": "3.45.1" }, "scriptName": { "value": "install_xray_to_vm.sh" From 2786452aeec04de0f68eed96f8590daed5db1469 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 7 Apr 2022 16:01:30 +0530 Subject: [PATCH 14/24] Updated new RT version 7.35.2 --- .../MP_submission/createUiDefinition.json | 162 +++++++++--------- .../MP_submission/mainTemplate.json | 5 +- .../Artifactory/azuredeploy.json | 8 +- .../Artifactory/vm_install/vm_parameters.json | 4 +- 4 files changed, 93 insertions(+), 86 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index f4ce877..49b8ccc 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.33.12", + "defaultValue": "7.35.2", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -140,94 +140,98 @@ "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.33.9", + "value": "0.0.37" + }, + { + "label": "7.33.12", + "value": "0.0.38" + }, + { + "label": "7.35.2", + "value": "0.0.39" + } ], "required": true }, diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index a3ef05c..9cdc0b4 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.38", + "defaultValue": "0.0.39", "allowedValues": [ "0.0.8", "0.0.9", @@ -103,7 +103,8 @@ "0.0.34", "0.0.35", "0.0.37", - "0.0.38" + "0.0.38", + "0.0.39" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 001ad58..b7693fd 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -79,10 +79,10 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.35", + "defaultValue": "0.0.39", "allowedValues": [ "0.0.8", - "0.0.9", + "0.0.9", "0.0.10", "0.0.11", "0.0.12", @@ -102,7 +102,9 @@ "0.0.33", "0.0.34", "0.0.35", - "0.0.37" + "0.0.37", + "0.0.38", + "0.0.39" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 4d94570..16b1a74 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "Password!123" + "value": "OWERWRITE_THE_PASSWORD" }, "artifactoryVersion": { - "value": "7.35.2" + "value": "OWERWRITE_LATEST_VERSION" }, "scriptName": { "value": "install_pro7_to_vm.sh" From 8d392aa850131fb5121fd347ad07774027ecded1 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 12 Apr 2022 12:13:49 +0530 Subject: [PATCH 15/24] changes in api version --- .../Artifactory/MP_submission/mainTemplate.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 9cdc0b4..d248bd4 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -82,7 +82,7 @@ "defaultValue": "0.0.39", "allowedValues": [ "0.0.8", - "0.0.9", + "0.0.9", "0.0.10", "0.0.11", "0.0.12", @@ -326,7 +326,7 @@ }, "resources": [ { - "apiVersion": "2020-06-01", + "apiVersion": "2021-12-01", "name": "pid-9cc90849-b021-4272-a33f-1922bd5c0f99-partnercenter", "type": "Microsoft.Resources/deployments", "properties": { @@ -423,7 +423,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'))]" ], @@ -456,7 +456,7 @@ } }, { - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "type": "Microsoft.Network/networkInterfaces", "name": "[variables('nicPrimaryName')]", "location": "[parameters('location')]", @@ -483,7 +483,7 @@ } }, { - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "type": "Microsoft.Network/networkInterfaces", "name": "[variables('nicMemberName')]", "location": "[parameters('location')]", @@ -516,7 +516,7 @@ "sku": { "name": "Standard" }, - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "properties": { "publicIPAllocationMethod": "Static", "dnsSettings": { @@ -531,7 +531,7 @@ "sku": { "name": "Standard" }, - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "properties": { "publicIPAllocationMethod": "Static", "dnsSettings": { @@ -543,7 +543,7 @@ "type": "Microsoft.Network/loadBalancers", "name": "[variables('lbName')]", "location": "[parameters('location')]", - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "sku": { "name": "Standard" }, From d139bdb02b1cafa2cd5997b9861144e32b87f7a8 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 12 Apr 2022 12:20:42 +0530 Subject: [PATCH 16/24] changes in api version --- .../Artifactory/MP_submission/mainTemplate.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index d248bd4..11db166 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -343,7 +343,7 @@ "type": "Microsoft.Network/networkSecurityGroups", "location": "[parameters('location')]", "name": "[variables('nsgName')]", - "apiVersion": "2020-03-01", + "apiVersion": "2021-12-01", "properties": { "securityRules": [ { @@ -823,7 +823,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": [ @@ -920,7 +920,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": [ @@ -979,7 +979,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" } } From a3b97e4b631f6b36d62ccf5c99364cf502db3fd4 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Mon, 25 Apr 2022 14:44:01 +0530 Subject: [PATCH 17/24] changes in RT versions 7.37.14 --- .../Artifactory/MP_submission/createUiDefinition.json | 6 +++++- .../Artifactory/MP_submission/mainTemplate.json | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 49b8ccc..f647d6a 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.35.2", + "defaultValue": "7.37.14", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -231,6 +231,10 @@ { "label": "7.35.2", "value": "0.0.39" + }, + { + "label": "7.37.14", + "value": "0.0.40" } ], "required": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 11db166..8262f15 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.39", + "defaultValue": "0.0.40", "allowedValues": [ "0.0.8", "0.0.9", @@ -104,7 +104,8 @@ "0.0.35", "0.0.37", "0.0.38", - "0.0.39" + "0.0.39", + "0.0.40" ], "metadata": { "description": "Artifactory-vm image version to deploy." From d8a72bb1c2c53790314ad106de6aea6542437981 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 14 Jun 2022 12:52:24 +0530 Subject: [PATCH 18/24] Add support for 64 characters keys, generated by openssl rand -hex 32 --- .../MP_submission/createUiDefinition.json | 12 ++++++------ AzureResourceManager/Artifactory/azuredeploy.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index f647d6a..ce3adff 100644 --- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json @@ -248,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 @@ -265,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/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index b7693fd..99761c4 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -114,14 +114,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": { From 8483d4d33021db1353b973671c3c12059333fe06 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 14 Jun 2022 13:17:46 +0530 Subject: [PATCH 19/24] api version changed and openssl support 64 in xray --- .../Artifactory/vm_install/vm_deploy.json | 2 +- .../Xray/MP_submission/createUiDefinition.json | 10 +++++----- AzureResourceManager/Xray/vm_install/vm_deploy.json | 2 +- .../Xray/vm_install/vm_parameters.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) 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 1223726..c3be75d 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -227,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 @@ -247,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/vm_install/vm_deploy.json b/AzureResourceManager/Xray/vm_install/vm_deploy.json index eef02c2..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": { diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json index ffd11e4..e9b0674 100644 --- a/AzureResourceManager/Xray/vm_install/vm_parameters.json +++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json @@ -87,10 +87,10 @@ "value": "vmuser" }, "adminPassword": { - "value": "Password!123" + "value": "OWERWRITE_THE_PASSWORD" }, "xrayVersion": { - "value": "3.45.1" + "value": "OWERWRITE_LATEST_VERSION" }, "scriptName": { "value": "install_xray_to_vm.sh" From 202fa963c1e8129ac8f0b45c00032eb0dce33273 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 14 Jun 2022 13:30:03 +0530 Subject: [PATCH 20/24] changed image version 0.0.34 --- .../Xray/azuredeploy_xray.parameters.json | 2 +- AzureResourceManager/Xray/azuredeploy_xray_vmss.json | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index 3837de2..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.33" + "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 7eb46b9..43cfb9f 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.33", + "defaultValue": "0.0.34", "allowedValues": [ "0.0.10", "0.0.11", @@ -41,7 +41,8 @@ "0.0.30", "0.0.31", "0.0.32", - "0.0.33" + "0.0.33", + "0.0.34" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -57,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": { From 833ddb26ee18af0a610ac8ed2fba2c1bdb54475d Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 14 Jun 2022 14:41:54 +0530 Subject: [PATCH 21/24] image version changed to 0.0.40 in azuredeploy.json --- AzureResourceManager/Artifactory/azuredeploy.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 99761c4..f15fd31 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.39", + "defaultValue": "0.0.40", "allowedValues": [ "0.0.8", "0.0.9", @@ -104,7 +104,8 @@ "0.0.35", "0.0.37", "0.0.38", - "0.0.39" + "0.0.39", + "0.0.40" ], "metadata": { "description": "Artifactory-vm image version to deploy." From 15ba0bd3d9b29434bc0fac349810f8e16fb2f079 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 14 Jun 2022 21:42:09 +0530 Subject: [PATCH 22/24] fixing indentation --- .../MP_submission/createUiDefinition.json | 162 +++++++++--------- .../MP_submission/mainTemplate.json | 6 +- .../Artifactory/azuredeploy.json | 8 +- .../MP_submission/createUiDefinition.json | 70 ++++---- .../Xray/MP_submission/mainTemplate.json | 18 +- .../Xray/azuredeploy_xray_vmss.json | 18 +- 6 files changed, 141 insertions(+), 141 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index ce3adff..35a6b45 100644 --- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json @@ -140,102 +140,102 @@ "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.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" - }, - { + "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.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 }, diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 8262f15..378125a 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -82,7 +82,7 @@ "defaultValue": "0.0.40", "allowedValues": [ "0.0.8", - "0.0.9", + "0.0.9", "0.0.10", "0.0.11", "0.0.12", @@ -104,8 +104,8 @@ "0.0.35", "0.0.37", "0.0.38", - "0.0.39", - "0.0.40" + "0.0.39", + "0.0.40" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index f15fd31..76d3a88 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -82,7 +82,7 @@ "defaultValue": "0.0.40", "allowedValues": [ "0.0.8", - "0.0.9", + "0.0.9", "0.0.10", "0.0.11", "0.0.12", @@ -103,9 +103,9 @@ "0.0.34", "0.0.35", "0.0.37", - "0.0.38", - "0.0.39", - "0.0.40" + "0.0.38", + "0.0.39", + "0.0.40" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index c3be75d..a3e26d3 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -176,45 +176,45 @@ "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" - } + { + "label": "3.41.4", + "value": "0.0.33" + }, + { + "label": "3.42.5", + "value": "0.0.34" + } ], "required": true }, diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 04afc7d..8435536 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -34,15 +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.33", - "0.0.34" + "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_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index 43cfb9f..93b439c 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -34,15 +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.33", - "0.0.34" + "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." From 423c29cd4c02b893ce1ddde58328c81a604be5aa Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 14 Jun 2022 22:33:45 +0530 Subject: [PATCH 23/24] fixed the indentaion --- .../MP_submission/mainTemplate.json | 56 +++++++-------- .../MP_submission/createUiDefinition.json | 68 +++++++++---------- .../Xray/MP_submission/mainTemplate.json | 10 +-- .../Xray/azuredeploy_xray_vmss.json | 16 ++--- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 378125a..6ef521c 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -81,29 +81,29 @@ "type": "string", "defaultValue": "0.0.40", "allowedValues": [ - "0.0.8", + "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.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" ], @@ -179,7 +179,7 @@ }, "certificateKey": { "type": "securestring", - "metadata": { + "metadata": { "description": "Provide your SSL Certificate key" } }, @@ -187,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" } }, @@ -195,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" } }, @@ -203,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." } }, @@ -552,7 +552,7 @@ "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]", "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]" ], - "tags":{ + "tags": { "displayName": "Load Balancer" }, "properties": { @@ -740,7 +740,7 @@ "sku": { "name": "[parameters('storageAccountType')]" }, - "tags":{ + "tags": { "displayName": "Artifactory Storage Account" }, "kind": "Storage", diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index a3e26d3..11dfd92 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -176,45 +176,45 @@ "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" - } + { + "label": "3.41.4", + "value": "0.0.33" + }, + { + "label": "3.42.5", + "value": "0.0.34" + } ], "required": true }, diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 8435536..d790a95 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -34,15 +34,15 @@ "0.0.23", "0.0.24", "0.0.25", - "0.0.26", + "0.0.26", "0.0.27", "0.0.28", - "0.0.29", + "0.0.29", "0.0.30", - "0.0.31", + "0.0.31", "0.0.32", - "0.0.33", - "0.0.34" + "0.0.33", + "0.0.34" ], "metadata": { "description": "Xray-vm image version to deploy." diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index 93b439c..15ef84b 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -34,14 +34,14 @@ "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.33", + "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": { From 070ea557dc013d04f163087344e177b7c20e1241 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Tue, 14 Jun 2022 22:40:44 +0530 Subject: [PATCH 24/24] fixed the indentation --- .../Artifactory/azuredeploy.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 76d3a88..5cf92e3 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -81,28 +81,28 @@ "type": "string", "defaultValue": "0.0.40", "allowedValues": [ - "0.0.8", + "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.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" @@ -179,7 +179,7 @@ }, "certificateKey": { "type": "securestring", - "metadata": { + "metadata": { "description": "Provide your SSL Certificate key" } }, @@ -187,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" } }, @@ -195,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" } }, @@ -203,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." } }, @@ -538,7 +538,7 @@ "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]", "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]" ], - "tags":{ + "tags": { "displayName": "Load Balancer" }, "properties": { @@ -726,7 +726,7 @@ "sku": { "name": "[parameters('storageAccountType')]" }, - "tags":{ + "tags": { "displayName": "Artifactory Storage Account" }, "kind": "Storage",