From 2f4c850be787e1d7b8143250560453e09a58c41c Mon Sep 17 00:00:00 2001 From: Sanjay Mantoor Date: Fri, 6 Aug 2021 17:22:11 +0000 Subject: [PATCH 1/2] securityfix: pass arguments from stdin --- .../src/main/arm/mainTemplate.json | 2 +- .../addnode/src/main/arm/mainTemplate.json | 2 +- .../main/scripts/addNodeToDynamicCluster.sh | 57 ++----------------- .../nestedtemplates/aadNestedTemplate.json | 4 +- .../clusterCustomSSLTemplate.json | 2 +- .../arm/nestedtemplates/clusterTemplate.json | 2 +- .../nestedtemplates/coherenceTemplate.json | 2 +- .../main/arm/nestedtemplates/dbTemplate.json | 2 +- .../nestedtemplates/elkNestedTemplate.json | 6 +- .../nestedtemplates/ohsNestedTemplate.json | 2 +- .../src/main/scripts/aadIntegration.sh | 30 +--------- .../main/scripts/datasourceConfig-oracle.sh | 24 +++----- .../scripts/datasourceConfig-postgresql.sh | 31 ++++------ .../scripts/datasourceConfig-sqlserver.sh | 24 +++----- .../elkIntegrationForConfiguredCluster.sh | 34 +++-------- .../elkIntegrationForDynamicCluster.sh | 25 +------- .../src/main/scripts/setupCoherence.sh | 53 +++-------------- .../main/scripts/setupDynamicClusterDomain.sh | 44 ++------------ .../src/main/scripts/setupOHS.sh | 19 +------ .../src/main/scripts/updateDNSZones.sh | 12 +--- .../deletenode/src/main/arm/mainTemplate.json | 2 +- .../deletenode/src/main/scripts/deletenode.sh | 29 +++------- .../test/scripts/gen-parameters-aad-ag.sh | 8 +-- .../test/scripts/gen-parameters-aad.sh | 4 +- .../test/scripts/gen-parameters-coherence.sh | 5 +- .../test/scripts/gen-parameters-db-aad.sh | 5 +- .../test/scripts/gen-parameters-db.sh | 4 +- ...gen-parameters-deploy-addnode-coherence.sh | 15 +---- .../scripts/gen-parameters-deploy-addnode.sh | 17 +----- .../gen-parameters-deploy-coherence.sh | 13 +---- .../test/scripts/gen-parameters-deploy-db.sh | 10 +--- .../gen-parameters-deploy-deletenode.sh | 9 +-- .../test/scripts/gen-parameters-deploy-elk.sh | 16 +----- .../test/scripts/gen-parameters-deploy.sh | 14 +---- .../test/scripts/gen-parameters-elk.sh | 4 +- .../test/scripts/gen-parameters.sh | 4 +- .../test/scripts/verify-deployments.sh | 8 +-- .../test/scripts/verify-wls-access.sh | 7 +-- 38 files changed, 95 insertions(+), 456 deletions(-) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/src/main/arm/mainTemplate.json index c6cdf4d43..45b1f75cc 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/src/main/arm/mainTemplate.json @@ -394,7 +394,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptCoherenceFile'), ' ', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2019-04-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ',variables('name_wlsServerPrefix'),' ',copyIndex(variables('const_cacheServerIndexOffset')),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyAlias), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyPassPhrase), 'null'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptCoherenceFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2019-04-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ',variables('name_wlsServerPrefix'),' ',copyIndex(variables('const_cacheServerIndexOffset')),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyAlias), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyPassPhrase), 'null'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/arm/mainTemplate.json index da0f9d088..a3ecd6314 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/arm/mainTemplate.json @@ -410,7 +410,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('dynamicClusterSize'),' ', variables('const_managedVMPrefix'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2019-04-01').keys[0].value,' ', variables('const_mountPointPath'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').certificateBase64String, 'null'),' ',if(parameters('aadsSettings').enable, parameters('aadsSettings').publicIP, 'null'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').serverHost, 'null'),' ',parameters('elkSettings').enable,' ', parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword,' ', array.join(parameters('elkSettings').logsToIntegrate), ' ', parameters('elkSettings').logIndex, ' ', parameters('maxDynamicClusterSize'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyAlias, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyPassPhrase, 'null'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('dynamicClusterSize'),' ', variables('const_managedVMPrefix'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2019-04-01').keys[0].value,' ', variables('const_mountPointPath'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').certificateBase64String, 'null'),' ',if(parameters('aadsSettings').enable, parameters('aadsSettings').publicIP, 'null'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').serverHost, 'null'),' ',parameters('elkSettings').enable,' ', parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword,' ', array.join(parameters('elkSettings').logsToIntegrate), ' ', parameters('elkSettings').logIndex, ' ', parameters('maxDynamicClusterSize'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyAlias, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyPassPhrase, 'null'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh index b6d85451b..9c6272de0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh @@ -11,7 +11,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./addnode.sh " + echo_stderr "./addnode.sh" } function installUtilities() @@ -618,60 +618,13 @@ function parseAndSaveCustomSSLKeyStoreData() SCRIPT_PWD=`pwd` # store arguments in a special array -args=("$@") +#args=("$@") # get number of elements -ELEMENTS=${#args[@]} - -# echo each element in array -# for loop -for (( i=0;i<$ELEMENTS;i++)); do - echo "ARG[${args[${i}]}]" -done - -if [ $# -lt 24 ] -then - usage - exit 1 -fi +#ELEMENTS=${#args[@]} -wlsDomainName=$1 -wlsUserName=$2 -wlsPassword=$3 -managedServerPrefix=$4 -serverIndex=$5 -wlsAdminURL=$6 -oracleHome=${7} -wlsDomainPath=${8} -dynamicClusterSize=${9} -vmNamePrefix=${10} -storageAccountName=${11} -storageAccountKey=${12} -mountpointPath=${13} -wlsADSSLCer="${14}" -wlsLDAPPublicIP="${15}" -adServerHost="${16}" -enableELK=${17} -elasticURI=${18} -elasticUserName=${19} -elasticPassword=${20} -logsToIntegrate=${21} -logIndex=${22} -maxDynamicClusterSize=${23} - -isCustomSSLEnabled="${24}" -isCustomSSLEnabled="${isCustomSSLEnabled,,}" +read wlsDomainName wlsUserName wlsPassword managedServerPrefix serverIndex wlsAdminURL oracleHome wlsDomainPath dynamicClusterSize vmNamePrefix storageAccountName storageAccountKey mountpointPath wlsADSSLCer wlsLDAPPublicIP adServerHost enableELK elasticURI elasticUserName elasticPassword logsToIntegrate logIndex maxDynamicClusterSize isCustomSSLEnabled customIdentityKeyStoreBase64String customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreBase64String customTrustKeyStorePassPhrase customTrustKeyStoreType privateKeyAlias privateKeyPassPhrase -if [ "${isCustomSSLEnabled,,}" == "true" ]; -then - customIdentityKeyStoreBase64String="${25}" - customIdentityKeyStorePassPhrase="${26}" - customIdentityKeyStoreType="${27}" - customTrustKeyStoreBase64String="${28}" - customTrustKeyStorePassPhrase="${29}" - customTrustKeyStoreType="${30}" - privateKeyAlias="${31}" - privateKeyPassPhrase="${32}" -fi +isCustomSSLEnabled="${isCustomSSLEnabled,,}" enableAAD="false" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json index dae5b8530..e2f19cee8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json @@ -197,7 +197,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' ', variables('const_aadParameters'),' ', add(copyIndex(),1))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' <<< \"', variables('const_aadParameters'),' ', add(copyIndex(),1),'\"')]" } } }, @@ -220,7 +220,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' ', variables('const_aadParameters'),' ', 0)]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' <<< \"', variables('const_aadParameters'),' ', 0,'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json index 115c4645a..a915675a4 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json @@ -522,7 +522,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyindex(),' ',variables('const_managedVMPrefix'),' ',parameters('maxDynamicClusterSize'),' ',parameters('dynamicClusterSize'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2019-04-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),' ')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyindex(),' ',variables('const_managedVMPrefix'),' ',parameters('maxDynamicClusterSize'),' ',parameters('dynamicClusterSize'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2019-04-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterTemplate.json index 64116de86..cdc3682a6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterTemplate.json @@ -465,7 +465,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyindex(),' ',variables('const_managedVMPrefix'),' ',parameters('maxDynamicClusterSize'),' ',parameters('dynamicClusterSize'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2019-04-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyindex(),' ',variables('const_managedVMPrefix'),' ',parameters('maxDynamicClusterSize'),' ',parameters('dynamicClusterSize'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2019-04-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false','\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json index a01f9d1cd..0ee4f0072 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json @@ -466,7 +466,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' ', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',' ', parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2019-04-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'), ' ',parameters('enableELK'),' ',variables('const_singleQuote'),parameters('elasticsearchEndpoint'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchUserName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchPassword'),variables('const_singleQuote'),' ',array.join(parameters('logsToIntegrate')),' ',variables('const_singleQuote'),parameters('logIndex'),variables('const_singleQuote'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),' ')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',' ', parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2019-04-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'), ' ',parameters('enableELK'),' ',variables('const_singleQuote'),parameters('elasticsearchEndpoint'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchUserName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchPassword'),variables('const_singleQuote'),' ',array.join(parameters('logsToIntegrate')),' ',variables('const_singleQuote'),parameters('logIndex'),variables('const_singleQuote'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dbTemplate.json index c82fe5446..bfce9c15c 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dbTemplate.json @@ -126,7 +126,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFilePrefix'),parameters('databaseType'),'.sh ',variables('const_wlsHome'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ',parameters('wlsUserName'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ',parameters('jdbcDataSourceName'),' ',variables('const_singleQuote'),parameters('dsConnectionURL'),variables('const_singleQuote'),' ',parameters('dbUser'),' ',variables('const_singleQuote'),parameters('dbPassword'),variables('const_singleQuote'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFilePrefix'),parameters('databaseType'),'.sh <<< \"',variables('const_wlsHome'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ',parameters('wlsUserName'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ',parameters('jdbcDataSourceName'),' ',variables('const_singleQuote'),parameters('dsConnectionURL'),variables('const_singleQuote'),' ',parameters('dbUser'),' ',variables('const_singleQuote'),parameters('dbPassword'),variables('const_singleQuote'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json index 2f1fc49d4..63f026f8d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json @@ -180,7 +180,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' ', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ' ,parameters('managedServerPrefix'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',0, ' ', variables('const_logIndex'), ' ', parameters('maxDynamicClusterSize'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' <<< \"', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ' ,parameters('managedServerPrefix'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',0, ' ', variables('const_logIndex'), ' ', parameters('maxDynamicClusterSize'),'\"')]" } } }, @@ -207,7 +207,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' ', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ' ,parameters('managedServerPrefix'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',copyIndex(1), ' ', variables('const_logIndex'), ' ', parameters('maxDynamicClusterSize'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' <<< \"', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ' ,parameters('managedServerPrefix'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',copyIndex(1), ' ', variables('const_logIndex'), ' ', parameters('maxDynamicClusterSize'),'\"')]" } } }, @@ -234,7 +234,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' ', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ' ,concat(parameters('managedServerPrefix'), 'Storage'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',copyIndex(1), ' ', variables('const_logIndex'), ' ', parameters('maxDynamicClusterSize'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' <<< \"', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ' ,concat(parameters('managedServerPrefix'), 'Storage'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',copyIndex(1), ' ', variables('const_logIndex'), ' ', parameters('maxDynamicClusterSize'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json index d837eec65..f09758596 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json @@ -352,7 +352,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh setupOHS.sh',' ',parameters('ohsDomainName'),' ',parameters('ohsComponentName'),' ',parameters('ohsNMUser'),' ',parameters('ohsNMPassword'),' ',parameters('ohshttpPort'),' ',parameters('ohshttpsPort'),' ',parameters('adminRestMgmtURL'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',base64(parameters('ohsSSLKeystoreData')),' ',base64(parameters('ohsSSLKeystorePassword')),' ',parameters('oracleVaultPswd'),' ',parameters('keyType'))]" + "commandToExecute": "[concat('sh setupOHS.sh',' <<< \"',parameters('ohsDomainName'),' ',parameters('ohsComponentName'),' ',parameters('ohsNMUser'),' ',parameters('ohsNMPassword'),' ',parameters('ohshttpPort'),' ',parameters('ohshttpsPort'),' ',parameters('adminRestMgmtURL'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',base64(parameters('ohsSSLKeystoreData')),' ',base64(parameters('ohsSSLKeystorePassword')),' ',parameters('oracleVaultPswd'),' ',parameters('keyType'))]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh index f49e27f59..21336b380 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh @@ -11,7 +11,7 @@ function echo_stderr() #Function to display usage message function usage() { - echo_stderr "./aadIntegration.sh " + echo_stderr "./aadIntegration.sh" } function validateInput() @@ -445,33 +445,7 @@ USER_ORACLE="oracle" GROUP_ORACLE="oracle" DOMAIN_PATH="/u01/domains" -if [ $# -ne 21 ] -then - usage - exit 1 -fi - -wlsUserName=$1 -wlsPassword=$2 -wlsDomainName=$3 -adProviderName=$4 -adServerHost=$5 -adServerPort=$6 -adPrincipal=$7 -adPassword=$8 -adGroupBaseDN=$9 -adUserBaseDN=${10} -oracleHome=${11} -wlsAdminHost=${12} -wlsAdminPort=${13} -wlsADSSLCer="${14}" -wlsLDAPPublicIP="${15}" -wlsAdminServerName=${16} -wlsDomainPath=${17} -isCustomSSLEnabled=${18} -customTrustKeyStorePassPhrase="${19}" -customTrustKeyStoreType="${20}" -vmIndex=${21} +read wlsUserName wlsPassword wlsDomainName adProviderName adServerHost adServerPort adPrincipal adPassword adGroupBaseDN adUserBaseDN oracleHome wlsAdminHost wlsAdminPort wlsADSSLCer wlsLDAPPublicIP wlsAdminServerName wlsDomainPath isCustomSSLEnabled customTrustKeyStorePassPhrase customTrustKeyStoreType vmIndex isCustomSSLEnabled="${isCustomSSLEnabled,,}" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh index 979818b03..5a16adf43 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh @@ -2,16 +2,12 @@ # Copyright (c) 2021, Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -oracleHome=$1 -wlsAdminHost=$2 -wlsAdminPort=$3 -wlsUserName=$4 -wlsPassword=$5 -jdbcDataSourceName=$6 -dsConnectionURL=$7 -dsUser=$8 -dsPassword=$9 -wlsClusterName=${10-cluster1} +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName + +if [ -z ${wlsClusterName} ]; then + wlsClusterName='cluster1' +fi + wlsAdminURL=$wlsAdminHost:$wlsAdminPort hostName=`hostname` @@ -24,7 +20,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh" } function validateInput() @@ -145,12 +141,6 @@ function createTempFolder() sudo rm -rf $scriptPath/* } -if [ $# -lt 9 ] -then - usage - exit 1 -fi - createTempFolder validateInput createJDBCSource_model diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh index c79f396f5..8b36e0ce7 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh @@ -2,16 +2,12 @@ # Copyright (c) 2021, Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -oracleHome=$1 -wlsAdminHost=$2 -wlsAdminPort=$3 -wlsUserName=$4 -wlsPassword=$5 -jdbcDataSourceName=$6 -dsConnectionURL=$7 -dsUser=$8 -dsPassword=$9 -wlsClusterName=${10-cluster1} +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName + +if [ -z ${wlsClusterName} ]; then + wlsClusterName='cluster1' +fi + wlsAdminURL=$wlsAdminHost:$wlsAdminPort hostName=`hostname` @@ -24,7 +20,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh" } function validateInput() @@ -153,16 +149,9 @@ ELEMENTS=${#args[@]} # echo each element in array # for loop -for (( i=0;i <$ELEMENTS;i++)); do - echo "ARG[${args[${i}]}]" -done - - -if [ $# -lt 9 ] -then - usage - exit 1 -fi +#for (( i=0;i <$ELEMENTS;i++)); do +# echo "ARG[${args[${i}]}]" +#done createTempFolder validateInput diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh index 68dd9c602..12213c3c6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh @@ -2,16 +2,12 @@ # Copyright (c) 2021, Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -oracleHome=$1 -wlsAdminHost=$2 -wlsAdminPort=$3 -wlsUserName=$4 -wlsPassword=$5 -jdbcDataSourceName=$6 -dsConnectionURL=$7 -dsUser=$8 -dsPassword=$9 -wlsClusterName=${10-cluster1} +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName + +if [ -z ${wlsClusterName} ]; then + wlsClusterName='cluster1' +fi + wlsAdminURL=$wlsAdminHost:$wlsAdminPort hostName=`hostname` @@ -24,7 +20,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh" } function validateInput() @@ -145,12 +141,6 @@ function createTempFolder() sudo rm -rf $scriptPath/* } -if [ $# -lt 9 ] -then - usage - exit 1 -fi - createTempFolder validateInput createJDBCSource_model diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh index 511fe114a..18f68dd76 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh @@ -9,7 +9,7 @@ function echo_stderr() { #Function to display usage message function usage() { - echo_stderr "./elkIntegrationForConfiguredCluster.sh " + echo_stderr "./elkIntegrationForConfiguredCluster.sh" } function validate_input() { @@ -722,40 +722,22 @@ function validate_elastic_server() SCRIPT_PWD=$(pwd) # store arguments in a special array -args=("$@") +#args=("$@") # get number of elements -ELEMENTS=${#args[@]} +#ELEMENTS=${#args[@]} # echo each element in array # for loop -for ((i = 0; i < $ELEMENTS; i++)); do - echo "ARG[${args[${i}]}]" -done - -oracleHome=$1 -wlsAdminURL=$2 -wlsUserName=$3 -wlsPassword=$4 -wlsAdminServerName=$5 -elasticURI=$6 -elasticUserName=$7 -elasticPassword=$8 -wlsDomainName=$9 -wlsDomainPath=${10} -logsToIntegrate=${11} -index=${12} -logIndex=${13} -managedServerPrefix=${14} +#for ((i = 0; i < $ELEMENTS; i++)); do +# echo "ARG[${args[${i}]}]" +#done + +read oracleHome wlsAdminURL wlsUserName wlsPassword wlsAdminServerName elasticURI elasticUserName elasticPassword wlsDomainName wlsDomainPath logsToIntegrate index logIndex managedServerPrefix hostName=$(hostname) userOracle="oracle" groupOracle="oracle" -if [ $# -ne 14 ]; then - usage - exit 1 -fi - create_temp_folder validate_input validate_elastic_server diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh index d0cc18fba..cb44d5ec0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh @@ -9,7 +9,7 @@ function echo_stderr() { #Function to display usage message function usage() { - echo_stderr "./elkIntegrationForDynamicCluster.sh " + echo_stderr "./elkIntegrationForDynamicCluster.sh" } function validate_input() { @@ -895,27 +895,8 @@ function validate_elastic_server() SCRIPT_PWD=$(pwd) -if [ $# -ne 15 ]; then - usage - exit 1 -fi - -oracleHome=$1 -wlsAdminURL=$2 -managedServerPrefix=$3 -wlsUserName=$4 -wlsPassword=$5 -wlsAdminServerName=$6 -elasticURI=$7 -elasticUserName=$8 -elasticPassword=$9 -wlsDomainName=${10} -wlsDomainPath=${11} -logsToIntegrate=${12} -index=${13} -logIndex=${14} -maxDynamicClusterSize=${15} - +read oracleHome wlsAdminURL managedServerPrefix wlsUserName wlsPassword wlsAdminServerName elasticURI elasticUserName elasticPassword wlsDomainName wlsDomainPath logsToIntegrate index logIndex maxDynamicClusterSize + hostName=$(hostname) userOracle="oracle" groupOracle="oracle" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh index c3906c723..89595e9a5 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh @@ -9,7 +9,7 @@ function echo_stderr() { #Function to display usage message function usage() { - echo_stderr "./setupCoherence.sh [ ]" + echo_stderr "./setupCoherence.sh" } function installUtilities() { @@ -603,59 +603,20 @@ function storeCustomSSLCerts() SCRIPT_PWD=$(pwd) # store arguments in a special array -args=("$@") +#args=("$@") # get number of elements -ELEMENTS=${#args[@]} +#ELEMENTS=${#args[@]} # echo each element in array # for loop -for ((i = 0; i < $ELEMENTS; i++)); do - echo "ARG[${args[${i}]}]" -done +#for ((i = 0; i < $ELEMENTS; i++)); do +# echo "ARG[${args[${i}]}]" +#done -if [ $# -lt 19 ]; then - usage - exit 1 -fi +read wlsDomainName wlsUserName wlsPassword adminVMName oracleHome wlsDomainPath storageAccountName storageAccountKey mountpointPath enableWebLocalStorage enableELK elasticURI elasticUserName elasticPassword logsToIntegrate logIndex managedServerPrefix serverIndex isCustomSSLEnabled customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase -wlsDomainName=$1 -wlsUserName=$2 -wlsPassword=$3 -adminVMName=$4 -oracleHome=$5 -wlsDomainPath=$6 -storageAccountName=$7 -storageAccountKey=$8 -mountpointPath=$9 -enableWebLocalStorage=${10} -enableELK=${11} -elasticURI=${12} -elasticUserName=${13} -elasticPassword=${14} -logsToIntegrate=${15} -logIndex=${16} -managedServerPrefix=${17} -serverIndex=${18} - -isCustomSSLEnabled="${19}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" -#case insensitive check -if [ "${isCustomSSLEnabled}" == "true" ]; -then - echo "custom ssl enabled. Reading keystore information" - customIdentityKeyStoreData="${20}" - customIdentityKeyStorePassPhrase="${21}" - customIdentityKeyStoreType="${22}" - customTrustKeyStoreData="${23}" - customTrustKeyStorePassPhrase="${24}" - customTrustKeyStoreType="${25}" - serverPrivateKeyAlias="${26}" - serverPrivateKeyPassPhrase="${27}" -else - isCustomSSLEnabled="false" -fi - clientClusterName="cluster1" coherenceClusterName="myCoherence" coherenceListenPort=7574 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh index 7070f34b9..1c692edcd 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh @@ -11,7 +11,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./setDynamicClusterDomain.sh [ ]" + echo_stderr "./setDynamicClusterDomain.sh" } function installUtilities() @@ -808,9 +808,9 @@ CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASE_DIR="$(readlink -f ${CURR_DIR})" # store arguments in a special array -args=("$@") +#args=("$@") # get number of elements -ELEMENTS=${#args[@]} +#ELEMENTS=${#args[@]} # echo each element in array # for loop @@ -818,52 +818,16 @@ ELEMENTS=${#args[@]} # echo "ARG[${args[${i}]}]" #done -if [ $# -lt 15 ] -then - usage - exit 1 -fi - -wlsDomainName=${1} -wlsUserName=${2} -wlsPassword=${3} -managedServerPrefix=${4} -indexValue=${5} -vmNamePrefix=${6} -maxDynamicClusterSize=${7} -dynamicClusterSize=${8} -adminVMName=${9} -oracleHome=${10} -storageAccountName=${11} -storageAccountKey=${12} -mountpointPath=${13} +read wlsDomainName wlsUserName wlsPassword managedServerPrefix indexValue vmNamePrefix maxDynamicClusterSize dynamicClusterSize adminVMName oracleHome storageAccountName storageAccountKey mountpointPath isHTTPAdminListenPortEnabled isCustomSSLEnabled customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase DOMAIN_PATH="/u01/domains" startWebLogicScript="${DOMAIN_PATH}/${wlsDomainName}/startWebLogic.sh" stopWebLogicScript="${DOMAIN_PATH}/${wlsDomainName}/bin/customStopWebLogic.sh" -isHTTPAdminListenPortEnabled="${14}" isHTTPAdminListenPortEnabled="${isHTTPAdminListenPortEnabled,,}" -isCustomSSLEnabled="${15}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" -#case insensitive check -if [ "${isCustomSSLEnabled}" == "true" ]; -then - echo "custom ssl enabled. Reading keystore information" - customIdentityKeyStoreData="${16}" - customIdentityKeyStorePassPhrase="${17}" - customIdentityKeyStoreType="${18}" - customTrustKeyStoreData="${19}" - customTrustKeyStorePassPhrase="${20}" - customTrustKeyStoreType="${21}" - serverPrivateKeyAlias="${22}" - serverPrivateKeyPassPhrase="${23}" -else - isCustomSSLEnabled="false" -fi - # Always index 0 is set as admin server coherenceListenPort=7574 coherenceLocalport=42000 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh index be04a5f10..fc1dd7763 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh @@ -11,7 +11,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./setupOHS.sh " + echo_stderr "./setupOHS.sh" } # Create user "oracle", used for instalation and setup @@ -472,19 +472,8 @@ function verifyService() CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASE_DIR="$(readlink -f ${CURR_DIR})" -OHS_DOMAIN_NAME=$1 -OHS_COMPONENT_NAME=$2 -OHS_NM_USER=$3 -OHS_NM_PSWD=$4 -OHS_HTTP_PORT=$5 -OHS_HTTPS_PORT=$6 -WLS_REST_URL=$7 -WLS_USER=$8 -WLS_PASSWORD=$9 -OHS_KEY_STORE_DATA=${10} -OHS_KEY_STORE_PASSPHRASE=${11} -ORACLE_VAULT_PASSWORD=${12} -OHS_KEY_TYPE=${13} +read OHS_DOMAIN_NAME OHS_COMPONENT_NAME OHS_NM_USER OHS_NM_PSWD OHS_HTTP_PORT OHS_HTTPS_PORT WLS_REST_URL WLS_USER WLS_PASSWORD OHS_KEY_STORE_DATA OHS_KEY_STORE_PASSPHRASE ORACLE_VAULT_PASSWORD OHS_KEY_TYPE + JDK_PATH="/u01/app/jdk" JDK_VERSION="jdk1.8.0_271" JAVA_HOME=$JDK_PATH/$JDK_VERSION @@ -497,8 +486,6 @@ OHS_VAULT_PATH="${DOMAIN_PATH}/ohsvault" groupname="oracle" username="oracle" - - validateInput setupDomainPath setupOHSDomain diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh index a8d38e1f8..9a250e699 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh @@ -3,17 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -resourceGroup=$1 -zoneName=$2 -recordSetNames=$3 -targetResources=$4 -lenRecordset=$5 -lenTargets=$6 -ttl=${7} -cnameRecordSetNames=${8} -cnameAlias=${9} -lenCnameRecordSetNames=${10} -lenCnameAlias=${11} +read resourceGroup zoneName recordSetNames targetResources lenRecordset lenTargets ttl cnameRecordSetNames cnameAlias lenCnameRecordSetNames lenCnameAlias if [[ ${lenRecordset} != ${lenTargets} ]]; then echo "Error: number of A record set names is not equal to that of target resources." diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/arm/mainTemplate.json index c408300b9..77e59bb2a 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/arm/mainTemplate.json @@ -130,7 +130,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ', variables('name_scriptDeleteNode'), ' ', parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', array.join(parameters('deletingManagedServerMachineNames')),' ', parameters('wlsForceShutDown'), ' ', parameters('adminVMName'), ' ',variables('const_wlsAdminPort'),' ',variables('const_wlsHome'), ' ', parameters('managedServerPrefix'), ' ', array.join(parameters('deletingCacheServerNames')))]" + "commandToExecute": "[concat('sh',' ', variables('name_scriptDeleteNode'), ' <<< \"', parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', array.join(parameters('deletingManagedServerMachineNames')),' ', parameters('wlsForceShutDown'), ' ', parameters('adminVMName'), ' ',variables('const_wlsAdminPort'),' ',variables('const_wlsHome'), ' ', parameters('managedServerPrefix'), ' ', array.join(parameters('deletingCacheServerNames')),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/scripts/deletenode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/scripts/deletenode.sh index fa39b5132..657ea8569 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/scripts/deletenode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/scripts/deletenode.sh @@ -11,7 +11,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./deletenode.sh " + echo_stderr "./deletenode.sh" } function validateInput() @@ -233,31 +233,18 @@ function delete_managed_machine() #main script starts here # store arguments in a special array -args=("$@") +#args=("$@") # get number of elements -ELEMENTS=${#args[@]} +#ELEMENTS=${#args[@]} # echo each element in array # for loop -for ((i = 0; i < $ELEMENTS; i++)); do - echo "ARG[${args[${i}]}]" -done +#for ((i = 0; i < $ELEMENTS; i++)); do +# echo "ARG[${args[${i}]}]" +#done + +read wlsUserName wlsPassword managedVMNames wlsForceShutDown wlsAdminHost wlsAdminPort oracleHome managedServerPrefix deletingCacheServerNames -if [ $# -ne 9 ] -then - usage - exit 1 -fi - -wlsUserName=$1 -wlsPassword=$2 -managedVMNames=$3 -wlsForceShutDown=$4 -wlsAdminHost=$5 -wlsAdminPort=$6 -oracleHome=$7 -managedServerPrefix=$8 -deletingCacheServerNames=$9 wlsAdminURL=$wlsAdminHost:$wlsAdminPort hostName=`hostname` wlsClusterName="cluster1" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh index f81a2cd08..d86171b37 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh @@ -3,13 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 -keyVaultName=$4 -keyVaultResourceGroup=$5 -keyVaultSSLCertDataSecretName=$6 -keyVaultSSLCertPasswordSecretName=$7 +read parametersPath githubUserName testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh index bc773b301..9460c8b6f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh @@ -3,9 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh index 97bc1a05a..7a5ccd8b5 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh @@ -3,10 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # - -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +read parametersPath githubUserName testbranchName cat <${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh index 35ef2e5ba..e221a85f6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh @@ -3,10 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # - -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh index 815d374fd..00a9c2246 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh @@ -3,9 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh index 23ef39650..d33c6d560 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh @@ -4,20 +4,7 @@ # #Generate parameters with value for deploying addnode template -parametersPath=$1 -adminPasswordOrKey=$2 -adminVMName=$3 -adminUsername=$4 -numberOfExistingCacheNodes=$5 -skuUrnVersion=$6 -storageAccountName=${7} -wlsDomainName=${8} -location=${9} -wlsusername=${10} -wlspassword=${11} -gitUserName=${12} -testbranchName=${13} -managedServerPrefix=${14} +read parametersPath adminPasswordOrKey adminVMName adminUsername numberOfExistingCacheNodes skuUrnVersion storageAccountName wlsDomainName location wlsusername wlspassword gitUserName testbranchName managedServerPrefix cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh index 09ce803a6..33aac06b2 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh @@ -4,22 +4,7 @@ # #Generate parameters with value for deploying addnode template -parametersPath=$1 -adminPasswordOrKey=$2 -adminURL=$3 -adminUsername=$4 -numberOfExistingNodes=$5 -skuUrnVersion=$6 -storageAccountName=${7} -wlsDomainName=${8} -location=${9} -wlsusername=${10} -wlspassword=${11} -gitUserName=${12} -testbranchName=${13} -managedServerPrefix=${14} -dynamicClusterSize=${15} -maxDynamicClusterSize=${16} +read parametersPath adminPasswordOrKey adminURL adminUsername numberOfExistingNodes skuUrnVersion storageAccountName wlsDomainName location wlsusername wlspassword gitUserName testbranchName managedServerPrefix dynamicClusterSize maxDynamicClusterSize cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh index 2a0e895d8..69234a45c 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh @@ -4,18 +4,7 @@ # #Generate parameters with value for deploying coherence template independently -parametersPath=$1 -adminVMName=$2 -adminPasswordOrKey=$3 -skuUrnVersion=$4 -location=$5 -storageAccountName=$6 -wlsDomainName=$7 -wlsusername=$8 -wlspassword=$9 -gitUserName=${10} -testbranchName=${11} -managedServerPrefix=${12} +read parametersPath adminVMName adminPasswordOrKey skuUrnVersion location storageAccountName wlsDomainName wlsusername wlspassword gitUserName testbranchName managedServerPrefix cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh index 4ce10b185..f9f865935 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh @@ -4,15 +4,7 @@ # #Generate parameters with value for deploying db template independently -parametersPath=$1 -adminVMName=$2 -dbPassword=$3 -dbName=$4 -location=$5 -wlsusername=$6 -wlspassword=$7 -gitUserName=$8 -testbranchName=$9 +read parametersPath adminVMName dbPassword dbName location wlsusername wlspassword gitUserName testbranchName cat < ${parametersPath}/parameters-deploy-db.json { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-deletenode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-deletenode.sh index 3141ae992..42fad97f8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-deletenode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-deletenode.sh @@ -4,14 +4,7 @@ # #Generate parameters with value for deploying delete-node template -parametersPath=$1 -adminVMName=$2 -location=${3} -wlsusername=${4} -wlspassword=${5} -gitUserName=${6} -testbranchName=${7} -managedServerPrefix=${8} +read parametersPath adminVMName location wlsusername wlspassword gitUserName testbranchName managedServerPrefix cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-elk.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-elk.sh index e37b8b116..63435730f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-elk.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-elk.sh @@ -4,21 +4,7 @@ # #Generate parameters with value for deploying elk template independently -parametersPath=$1 -adminVMName=$2 -elasticsearchPassword=$3 -elasticsearchURI=$4 -elasticsearchUserName=$5 -location=$6 -wlsDomainName=$7 -wlsusername=$8 -wlspassword=${9} -gitUserName=${10} -testbranchName=${11} -managedServerPrefix=${12} -maxDynamicClusterSize=${13} -dynamicClusterSize=${14} -guidValue=${15} +read parametersPath adminVMName elasticsearchPassword elasticsearchURI elasticsearchUserName location wlsDomainName wlsusername wlspassword gitUserName testbranchName managedServerPrefix maxDynamicClusterSize dynamicClusterSize guidValue cat < ${parametersPath} diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh index 2342ac091..21842aceb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh @@ -3,19 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # #Generate parameters with value for deployment -parametersPath=$1 -location=$2 -adminPasswordOrKey=$3 -wlsdomainname=$4 -wlsusername=$5 -wlspassword=$6 -managedserverprefix=$7 -maxDynamicClusterSize=$8 -dynamicClusterSize=$9 -adminvmname=${10} -skuUrnVersion=${11} -testbranchName=${12} -gitUserName=${13} +read parametersPath location adminPasswordOrKey wlsdomainname wlsusername wlspassword managedserverprefix maxDynamicClusterSize dynamicClusterSize adminvmname skuUrnVersion testbranchName gitUserName cat <${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh index c5f8d1f5d..228d52673 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh @@ -3,9 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +read parametersPath githubUserName testbranchName cat <${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh index 52f1974b2..d72b0ca56 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh @@ -3,9 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-deployments.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-deployments.sh index 3cfacbff2..e5797b95d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-deployments.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-deployments.sh @@ -3,13 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # - -prefix="$1" -location="$2" -template="$3" -githubUserName="$4" -testbranchName="$5" -scriptsDir="$6" +read prefix location template githubUserName testbranchName scriptsDir groupName=${prefix}-preflight diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-wls-access.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-wls-access.sh index 4d2fb11ae..5a3d6f36b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-wls-access.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/verify-wls-access.sh @@ -3,11 +3,8 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # # Verifying admin server is accessible -adminPublicIP="$1" -adminPort=$2 -wlsUserName=$3 -wlspassword=$4 -managedServers=$5 + +read adminPublicIP adminPort wlsUserName wlspassword managedServers isSuccess=false From b8e0bd44ad6c832722f6c1c155ac320253e84517 Mon Sep 17 00:00:00 2001 From: Sanjay Mantoor Date: Fri, 6 Aug 2021 17:48:58 +0000 Subject: [PATCH 2/2] Corrected the changes --- .../src/main/scripts/updateDNSZones.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh index 9a250e699..a7d15407f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh @@ -3,7 +3,17 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -read resourceGroup zoneName recordSetNames targetResources lenRecordset lenTargets ttl cnameRecordSetNames cnameAlias lenCnameRecordSetNames lenCnameAlias +resourceGroup=$1 +zoneName=$2 +recordSetNames=$3 +targetResources=$4 +lenRecordset=$5 +lenTargets=$6 +ttl=${7} +cnameRecordSetNames=${8} +cnameAlias=${9} +lenCnameRecordSetNames=${10} +lenCnameAlias=${11} if [[ ${lenRecordset} != ${lenTargets} ]]; then echo "Error: number of A record set names is not equal to that of target resources."