From 561e565a1fef00d3d8cdff6159b5541bb59ddd81 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Fri, 26 Sep 2025 12:40:48 +0000 Subject: [PATCH 1/5] Azure Security Fix for WLS on AKS Offer --- .../main/arm/scripts/buildWLSDockerImage.sh | 24 ++++----- .../main/arm/scripts/createVMAndBuildImage.sh | 6 +-- .../src/main/arm/scripts/dbUtility.sh | 4 +- .../src/main/arm/scripts/genDomainConfig.sh | 6 +-- .../inline-scripts/enablePrometheusMetrics.sh | 4 +- .../inline-scripts/validateParameters.sh | 28 +++++------ .../main/arm/scripts/setupDBConnections.sh | 22 ++++---- .../src/main/arm/scripts/setupWLSDomain.sh | 50 +++++++++---------- .../main/arm/scripts/updateApplications.sh | 8 +-- .../src/main/arm/scripts/utility.sh | 4 +- .../main/arm/scripts/validateApplications.sh | 4 +- .../_ds-create-wls-cluster.bicep | 12 ++--- .../_ds-datasource-connection.bicep | 6 +-- .../_ds-validate-applications.bicep | 2 +- .../_ds-validate-parameters.bicep | 10 ++-- .../_ds_enable_prometheus_metrics.bicep | 2 +- .../_ds_update-applications.bicep | 2 +- 17 files changed, 97 insertions(+), 97 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh b/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh index 03dc722df..0a4b7e58c 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh @@ -8,14 +8,14 @@ function echo_stderr() { echo "$@" >&2 } -# read and from stdin +# read and from stdin function read_sensitive_parameters_from_stdin() { - read azureACRPassword ocrSSOPSW + read azureACRShibboleth ocrSSOShibboleth } #Function to display usage message function usage() { - echo " | ./buildWLSDockerImage.sh " + echo " | ./buildWLSDockerImage.sh " if [ $1 -eq 1 ]; then exit 1 fi @@ -51,8 +51,8 @@ function validate_inputs() { usage 1 fi - if [ -z "$azureACRPassword" ]; then - echo_stderr "azureACRPassword is required. " + if [ -z "$azureACRShibboleth" ]; then + echo_stderr "azureACRShibboleth is required. " usage 1 fi @@ -71,8 +71,8 @@ function validate_inputs() { usage 1 fi - if [[ "${useOracleImage,,}" == "${constTrue}" ]] && [ -z "$ocrSSOPSW" ]; then - echo_stderr "ocrSSOPSW is required. " + if [[ "${useOracleImage,,}" == "${constTrue}" ]] && [ -z "$ocrSSOShibboleth" ]; then + echo_stderr "ocrSSOShibboleth is required. " usage 1 fi @@ -334,8 +334,8 @@ function install_db_drivers() { # Pull weblogic image function get_wls_image_from_ocr() { sudo docker logout - sudo docker login ${ocrLoginServer} -u ${ocrSSOUser} -p ${ocrSSOPSW} - echo "Start to pull oracle image ${wlsImagePath} ${ocrLoginServer} ${ocrSSOUser} ${ocrSSOPSW}" + sudo docker login ${ocrLoginServer} -u ${ocrSSOUser} -p ${ocrSSOShibboleth} + echo "Start to pull oracle image ${wlsImagePath} ${ocrLoginServer} ${ocrSSOUser} ${ocrSSOShibboleth}" sudo docker pull -q ${wlsImagePath} validate_status "Finish pulling image from OCR." } @@ -343,8 +343,8 @@ function get_wls_image_from_ocr() { # Get user provided image function get_user_provided_wls_image_from_acr() { sudo docker logout - sudo docker login ${azureACRServer} -u ${azureACRUserName} -p ${azureACRPassword} - echo "Start to pull user provided image ${wlsImagePath} ${azureACRServer} ${azureACRUserName} ${azureACRPassword}" + sudo docker login ${azureACRServer} -u ${azureACRUserName} -p ${azureACRShibboleth} + echo "Start to pull user provided image ${wlsImagePath} ${azureACRServer} ${azureACRUserName} ${azureACRShibboleth}" sudo docker pull -q ${wlsImagePath} validate_status "Finish pulling image from OCR." } @@ -426,7 +426,7 @@ function build_wls_image() { # Push image to ACR sudo docker logout - sudo docker login $azureACRServer -u ${azureACRUserName} -p ${azureACRPassword} + sudo docker login $azureACRServer -u ${azureACRUserName} -p ${azureACRShibboleth} echo "Start pushing image ${acrImagePath} to $azureACRServer." sudo docker push -q ${acrImagePath} validate_status "Check status of pushing WLS domain image." diff --git a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh index d073f22a7..5aec0d499 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh @@ -6,9 +6,9 @@ echo "Script ${0} starts" -# read from stdin +# read from stdin function read_sensitive_parameters_from_stdin() { - read acrPassword + read acrShibboleth } function cleanup_vm() { @@ -153,7 +153,7 @@ function build_docker_image() { --publisher Microsoft.Azure.Extensions \ --version 2.0 \ --settings "{ \"fileUris\": [\"${SCRIPT_LOCATION}model.properties\",\"${SCRIPT_LOCATION}genImageModel.sh\",\"${SCRIPT_LOCATION}buildWLSDockerImage.sh\",\"${SCRIPT_LOCATION}common.sh\"]}" \ - --protected-settings "{\"commandToExecute\":\"echo ${acrPassword} ${ORACLE_ACCOUNT_PASSWORD} | bash buildWLSDockerImage.sh ${wlsImagePath} ${acrLoginServer} ${acrUser} ${newImageTag} ${WLS_APP_PACKAGE_URLS} ${ORACLE_ACCOUNT_NAME} ${WLS_CLUSTER_SIZE} ${ENABLE_CUSTOM_SSL} ${ENABLE_ADMIN_CUSTOM_T3} ${ENABLE_CLUSTER_CUSTOM_T3} ${USE_ORACLE_IMAGE} ${URL_3RD_DATASOURCE} ${ENABLE_PASSWORDLESS_DB_CONNECTION} ${DB_TYPE} ${CPU_PLATFORM} \"}" + --protected-settings "{\"commandToExecute\":\"echo ${acrShibboleth} ${ORACLE_ACCOUNT_SHIBBOLETH} | bash buildWLSDockerImage.sh ${wlsImagePath} ${acrLoginServer} ${acrUser} ${newImageTag} ${WLS_APP_PACKAGE_URLS} ${ORACLE_ACCOUNT_NAME} ${WLS_CLUSTER_SIZE} ${ENABLE_CUSTOM_SSL} ${ENABLE_ADMIN_CUSTOM_T3} ${ENABLE_CLUSTER_CUSTOM_T3} ${USE_ORACLE_IMAGE} ${URL_3RD_DATASOURCE} ${ENABLE_SHIBBOLETHLESS_DB_CONNECTION} ${DB_TYPE} ${CPU_PLATFORM} \"}" cleanup_vm } diff --git a/weblogic-azure-aks/src/main/arm/scripts/dbUtility.sh b/weblogic-azure-aks/src/main/arm/scripts/dbUtility.sh index dfa47c3a9..23a65d7b8 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/dbUtility.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/dbUtility.sh @@ -16,7 +16,7 @@ function generate_ds_model() { databaseDriver=${driverMySQL} databaseTestTableName=${testTableMySQL} - if [[ "${ENABLE_PASSWORDLESS_CONNECTION,,}" == "true" ]]; then + if [[ "${ENABLE_SHIBBOLETHLESS_CONNECTION,,}" == "true" ]]; then databaseDriver=${driverMySQLCj} fi elif [[ "${DATABASE_TYPE}" == "${dbTypeOthers}" ]]; then @@ -101,7 +101,7 @@ function create_datasource_secret() { echo "create/update secret ${dbSecretName} for ${JDBC_DATASOURCE_NAME}" kubectl -n ${domainNamespace} create secret generic \ ${dbSecretName} \ - --from-literal=password="${DB_PASSWORD}" \ + --from-literal=password="${DB_SHIBBOLETH}" \ --from-literal=url="${DB_CONNECTION_STRING}" \ --from-literal=user="${DB_USER}" diff --git a/weblogic-azure-aks/src/main/arm/scripts/genDomainConfig.sh b/weblogic-azure-aks/src/main/arm/scripts/genDomainConfig.sh index 59850674f..5636f9a05 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/genDomainConfig.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/genDomainConfig.sh @@ -19,7 +19,7 @@ if [[ "${DB_TYPE}" == "mysql" ]]; then preClassPath="/u01/domains/${WLS_DOMAIN_UID}/wlsdeploy/${constPreclassDirectoryName}/*:" fi -if [[ "${ENABLE_PASSWORDLESS_DB_CONNECTION,,}" == "true" ]] && [[ "${DB_TYPE}" == "mysql" || "${DB_TYPE}" == "postgresql" ]]; then +if [[ "${ENABLE_SHIBBOLETHLESS_DB_CONNECTION,,}" == "true" ]] && [[ "${DB_TYPE}" == "mysql" || "${DB_TYPE}" == "postgresql" ]]; then # append jackson libraries to pre-classpath to upgrade existing libs in GA images preClassPath="${preClassPath}/u01/domains/${WLS_DOMAIN_UID}/wlsdeploy/classpathLibraries/jackson/*" classPath="${classPath}:/u01/domains/${WLS_DOMAIN_UID}/wlsdeploy/classpathLibraries/azureLibraries/*" @@ -182,7 +182,7 @@ cat <>$filePath EOF # enable db pod identity, all of the selector of pod identities are "db-pod-idenity" -if [[ "${ENABLE_PASSWORDLESS_DB_CONNECTION,,}" == "true" ]]; then +if [[ "${ENABLE_SHIBBOLETHLESS_DB_CONNECTION,,}" == "true" ]]; then cat <>$filePath labels: aadpodidbinding: "${constDbPodIdentitySelector}" @@ -258,4 +258,4 @@ spec: # The number of managed servers to start for this cluster replicas: 2 -EOF \ No newline at end of file +EOF diff --git a/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh b/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh index 874ff613f..1d8917c8d 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh @@ -29,7 +29,7 @@ function enable_promethues_metrics(){ # https://learn.microsoft.com/en-us/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration function deploy_customize_scraping(){ # https://learn.microsoft.com/en-us/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration?tabs=CRDConfig%2CCRDScrapeConfig#basic-authentication - local wlsPswBase64=$(echo -n "${WLS_ADMIN_PASSWORD}" | base64) + local wlsShibbolethBase64=$(echo -n "${WLS_ADMIN_SHIBBOLETH}" | base64) cat <${testDatasourceScript} -connect('${WLS_DOMAIN_USER}', '${WLS_DOMAIN_PASSWORD}', '${t3ConnectionString}') +connect('${WLS_DOMAIN_USER}', '${WLS_DOMAIN_SHIBBOLETH}', '${t3ConnectionString}') serverRuntime() print 'start to query data source jndi bean' dsMBeans = cmo.getJDBCServiceRuntime().getJDBCDataSourceRuntimeMBeans() diff --git a/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh b/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh index 56cb7594e..6022152b8 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh @@ -21,7 +21,7 @@ ENABLE_CLUSTER_CUSTOM_T3 ENABLE_CUSTOM_SSL ENABLE_PV ORACLE_ACCOUNT_NAME -ORACLE_ACCOUNT_PASSWORD +ORACLE_ACCOUNT_SHIBBOLETH ORACLE_ACCOUNT_ENTITLED SCRIPT_LOCATION STORAGE_ACCOUNT_NAME @@ -30,7 +30,7 @@ USE_ORACLE_IMAGE USER_PROVIDED_IMAGE_PATH WLS_DOMAIN_NAME WLS_DOMAIN_UID -WLS_ADMIN_PASSWORD +WLS_ADMIN_SHIBBOLETH WLS_ADMIN_USER_NAME WLS_APP_PACKAGE_URLS WLS_APP_REPLICAS @@ -41,13 +41,13 @@ WLS_MANAGED_SERVER_PREFIX WLS_RESOURCE_REQUEST_CPU WLS_RESOURCE_REQUEST_MEMORY WLS_SSL_IDENTITY_DATA -WLS_SSL_IDENTITY_PASSWORD +WLS_SSL_IDENTITY_SHIBBOLETH WLS_SSL_IDENTITY_TYPE WLS_SSL_TRUST_DATA -WLS_SSL_TRUST_PASSWORD +WLS_SSL_TRUST_SHIBBOLETH WLS_SSL_TRUST_TYPE WLS_SSL_PRIVATE_KEY_ALIAS -WLS_SSL_PRIVATE_KEY_PASSWORD +WLS_SSL_PRIVATE_KEY_SHIBBOLETH WLS_T3_ADMIN_PORT WLS_T3_CLUSTER_PORT WLS_WDT_RUNTIME_PSW @@ -67,7 +67,7 @@ function validate_input() { usage 1 fi - if [[ "${USE_ORACLE_IMAGE,,}" == "${constTrue}" ]] && [[ -z "$ORACLE_ACCOUNT_NAME" || -z "${ORACLE_ACCOUNT_PASSWORD}" ]]; then + if [[ "${USE_ORACLE_IMAGE,,}" == "${constTrue}" ]] && [[ -z "$ORACLE_ACCOUNT_NAME" || -z "${ORACLE_ACCOUNT_SHIBBOLETH}" ]]; then echo_stderr "Oracle SSO account is required. " usage 1 fi @@ -102,8 +102,8 @@ function validate_input() { usage 1 fi - if [ -z "$WLS_ADMIN_PASSWORD" ]; then - echo_stderr "WLS_ADMIN_PASSWORD is required. " + if [ -z "$WLS_ADMIN_SHIBBOLETH" ]; then + echo_stderr "WLS_ADMIN_SHIBBOLETH is required. " usage 1 fi @@ -162,8 +162,8 @@ function validate_input() { usage 1 fi - if [[ -z "$WLS_SSL_IDENTITY_DATA" || -z "${WLS_SSL_IDENTITY_PASSWORD}" ]]; then - echo_stderr "WLS_SSL_IDENTITY_PASSWORD and WLS_SSL_IDENTITY_DATA are required. " + if [[ -z "$WLS_SSL_IDENTITY_DATA" || -z "${WLS_SSL_IDENTITY_SHIBBOLETH}" ]]; then + echo_stderr "WLS_SSL_IDENTITY_SHIBBOLETH and WLS_SSL_IDENTITY_DATA are required. " usage 1 fi @@ -172,13 +172,13 @@ function validate_input() { usage 1 fi - if [[ -z "$WLS_SSL_PRIVATE_KEY_ALIAS" || -z "${WLS_SSL_PRIVATE_KEY_PASSWORD}" ]]; then - echo_stderr "WLS_SSL_PRIVATE_KEY_ALIAS and WLS_SSL_PRIVATE_KEY_PASSWORD are required. " + if [[ -z "$WLS_SSL_PRIVATE_KEY_ALIAS" || -z "${WLS_SSL_PRIVATE_KEY_SHIBBOLETH}" ]]; then + echo_stderr "WLS_SSL_PRIVATE_KEY_ALIAS and WLS_SSL_PRIVATE_KEY_SHIBBOLETH are required. " usage 1 fi - if [[ -z "$WLS_SSL_TRUST_DATA" || -z "${WLS_SSL_TRUST_PASSWORD}" ]]; then - echo_stderr "WLS_SSL_TRUST_DATA and WLS_SSL_TRUST_PASSWORD are required. " + if [[ -z "$WLS_SSL_TRUST_DATA" || -z "${WLS_SSL_TRUST_SHIBBOLETH}" ]]; then + echo_stderr "WLS_SSL_TRUST_DATA and WLS_SSL_TRUST_SHIBBOLETH are required. " usage 1 fi @@ -384,7 +384,7 @@ function query_acr_credentials() { ACR_USER_NAME=$(az acr credential show -n $ACR_NAME -g ${ACR_RESOURCEGROUP_NAME} --query 'username' -o tsv) validate_status "Query ACR credentials." - ACR_PASSWORD=$(az acr credential show -n $ACR_NAME -g ${ACR_RESOURCEGROUP_NAME} --query 'passwords[0].value' -o tsv) + ACR_SHIBBOLETH=$(az acr credential show -n $ACR_NAME -g ${ACR_RESOURCEGROUP_NAME} --query 'passwords[0].value' -o tsv) validate_status "Query ACR credentials." } @@ -396,7 +396,7 @@ function query_acr_credentials() { function build_docker_image() { echo "build a new image including the new applications" chmod ugo+x $scriptDir/createVMAndBuildImage.sh - echo ${ACR_PASSWORD} | bash $scriptDir/createVMAndBuildImage.sh $newImageTag ${ACR_LOGIN_SERVER} ${ACR_USER_NAME} + echo ${ACR_SHIBBOLETH} | bash $scriptDir/createVMAndBuildImage.sh $newImageTag ${ACR_LOGIN_SERVER} ${ACR_USER_NAME} # to mitigate error in https://learn.microsoft.com/en-us/answers/questions/1188413/the-resource-with-name-name-and-type-microsoft-con az provider register -n Microsoft.ContainerRegistry @@ -429,7 +429,7 @@ function validate_ssl_keystores() { #validate if trust keystore has entry ${JAVA_HOME}/bin/keytool -list -v \ -keystore ${mntPath}/${wlsTrustKeyStoreJKSFileName} \ - -storepass $WLS_SSL_TRUST_PASSWORD \ + -storepass $WLS_SSL_TRUST_SHIBBOLETH \ -storetype jks | grep 'Entry type:' | grep 'trustedCertEntry' @@ -495,10 +495,10 @@ function output_ssl_keystore() { ${JAVA_HOME}/bin/keytool -importkeystore \ -srckeystore ${mntPath}/${wlsTrustKeyStoreFileName} \ -srcstoretype ${WLS_SSL_TRUST_TYPE} \ - -srcstorepass ${WLS_SSL_TRUST_PASSWORD} \ + -srcstorepass ${WLS_SSL_TRUST_SHIBBOLETH} \ -destkeystore ${mntPath}/${wlsTrustKeyStoreJKSFileName} \ -deststoretype jks \ - -deststorepass ${WLS_SSL_TRUST_PASSWORD} + -deststorepass ${WLS_SSL_TRUST_SHIBBOLETH} validate_status "Export trust JKS file." else @@ -613,7 +613,7 @@ function create_domain_namespace() { kubectl -n ${wlsDomainNS} create secret generic \ ${kubectlWLSCredentialName} \ --from-literal=username=${WLS_ADMIN_USER_NAME} \ - --from-literal=password=${WLS_ADMIN_PASSWORD} + --from-literal=password=${WLS_ADMIN_SHIBBOLETH} kubectl -n ${wlsDomainNS} label secret ${kubectlWLSCredentialName} weblogic.domainUID=${WLS_DOMAIN_UID} @@ -624,7 +624,7 @@ function create_domain_namespace() { kubectl create secret docker-registry ${kubectlSecretForACR} \ --docker-server=${ACR_LOGIN_SERVER} \ --docker-username=${ACR_USER_NAME} \ - --docker-password=${ACR_PASSWORD} \ + --docker-password=${ACR_SHIBBOLETH} \ -n ${wlsDomainNS} kubectl -n ${wlsDomainNS} label secret ${kubectlSecretForACR} weblogic.domainUID=${WLS_DOMAIN_UID} @@ -654,16 +654,16 @@ function parsing_ssl_certs_and_create_ssl_secret() { echo "create secret ${kubectlWLSSSLCredentialsName}" kubectl -n ${wlsDomainNS} create secret generic ${kubectlWLSSSLCredentialsName} \ --from-literal=sslidentitykeyalias=${WLS_SSL_PRIVATE_KEY_ALIAS} \ - --from-literal=sslidentitykeypassword=${WLS_SSL_PRIVATE_KEY_PASSWORD} \ + --from-literal=sslidentitykeypassword=${WLS_SSL_PRIVATE_KEY_SHIBBOLETH} \ --from-literal=sslidentitystorepath=${sharedPath}/$wlsIdentityKeyStoreFileName \ - --from-literal=sslidentitystorepassword=${WLS_SSL_IDENTITY_PASSWORD} \ + --from-literal=sslidentitystorepassword=${WLS_SSL_IDENTITY_SHIBBOLETH} \ --from-literal=sslidentitystoretype=${WLS_SSL_IDENTITY_TYPE} \ --from-literal=ssltruststorepath=${sharedPath}/${wlsTrustKeyStoreFileName} \ --from-literal=ssltruststoretype=${WLS_SSL_TRUST_TYPE} \ - --from-literal=ssltruststorepassword=${WLS_SSL_TRUST_PASSWORD} + --from-literal=ssltruststorepassword=${WLS_SSL_TRUST_SHIBBOLETH} kubectl -n ${wlsDomainNS} label secret ${kubectlWLSSSLCredentialsName} weblogic.domainUID=${WLS_DOMAIN_UID} - javaOptions=" -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.SSL.trustedCAKeyStore=${sharedPath}/${wlsTrustKeyStoreJKSFileName} -Dweblogic.security.SSL.trustedCAKeyStorePassPhrase=${WLS_SSL_TRUST_PASSWORD} ${javaOptions}" + javaOptions=" -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.SSL.trustedCAKeyStore=${sharedPath}/${wlsTrustKeyStoreJKSFileName} -Dweblogic.security.SSL.trustedCAKeyStorePassPhrase=${WLS_SSL_TRUST_SHIBBOLETH} ${javaOptions}" fi } diff --git a/weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh b/weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh index 9a6bf25a4..b71c02dc0 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh @@ -11,7 +11,7 @@ AKS_CLUSTER_NAME AKS_CLUSTER_RESOURCEGROUP_NAME CURRENT_RESOURCEGROUP_NAME ORACLE_ACCOUNT_NAME -ORACLE_ACCOUNT_PASSWORD +ORACLE_ACCOUNT_SHIBBOLETH STORAGE_ACCOUNT_NAME STORAGE_ACCOUNT_CONTAINER_NAME SCRIPT_LOCATION @@ -37,7 +37,7 @@ function validate_input() { usage 1 fi - if [[ "${USE_ORACLE_IMAGE,,}" == "${constTrue}" ]] && [[ -z "$ORACLE_ACCOUNT_NAME" || -z "${ORACLE_ACCOUNT_PASSWORD}" ]]; then + if [[ "${USE_ORACLE_IMAGE,,}" == "${constTrue}" ]] && [[ -z "$ORACLE_ACCOUNT_NAME" || -z "${ORACLE_ACCOUNT_SHIBBOLETH}" ]]; then echo_stderr "Oracle SSO account is required. " usage 1 fi @@ -116,7 +116,7 @@ function query_acr_credentials() { echo "query credentials of ACR ${ACR_NAME}" ACR_LOGIN_SERVER=$(az acr show -n $ACR_NAME --query 'loginServer' -o tsv) ACR_USER_NAME=$(az acr credential show -n $ACR_NAME --query 'username' -o tsv) - ACR_PASSWORD=$(az acr credential show -n $ACR_NAME --query 'passwords[0].value' -o tsv) + ACR_SHIBBOLETH=$(az acr credential show -n $ACR_NAME --query 'passwords[0].value' -o tsv) } function get_app_sas_url() { @@ -197,7 +197,7 @@ function build_docker_image() { export WLS_APP_PACKAGE_URLS=$(echo $WLS_APP_PACKAGE_URLS | base64 -w0) echo "build a new image including the new applications" chmod ugo+x $scriptDir/createVMAndBuildImage.sh - echo ${ACR_PASSWORD} \ + echo ${ACR_SHIBBOLETH} \ | bash $scriptDir/createVMAndBuildImage.sh $newImageTag ${ACR_LOGIN_SERVER} ${ACR_USER_NAME} az acr repository show -n ${ACR_NAME} --image aks-wls-images:${newImageTag} diff --git a/weblogic-azure-aks/src/main/arm/scripts/utility.sh b/weblogic-azure-aks/src/main/arm/scripts/utility.sh index 7807937f3..68095d8da 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/utility.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/utility.sh @@ -214,7 +214,7 @@ function utility_validate_application_status() { local wlsDomainNS=$1 local wlsAdminSvcName=$2 local wlsUser=$3 - local wlsPassword=$4 + local wlsShibboleth=$4 local pyScriptPath=$5 local podName=$(kubectl -n ${wlsDomainNS} get pod -l weblogic.serverName=admin-server -o json | @@ -229,7 +229,7 @@ function utility_validate_application_status() { echo "copy ${pyScriptPath} to ${targetFilePath}" kubectl cp ${pyScriptPath} -n ${wlsDomainNS} ${podName}:${targetFilePath} kubectl exec ${podName} -n ${wlsDomainNS} -c "weblogic-server" \ - -- bash -c "wlst.sh ${targetFilePath} -user ${wlsUser} -password ${wlsPassword} -t3ChannelAddress ${t3ChannelAddress} -t3ChannelPort ${adminTargetPort}" | + -- bash -c "wlst.sh ${targetFilePath} -user ${wlsUser} -password ${wlsShibboleth} -t3ChannelAddress ${t3ChannelAddress} -t3ChannelPort ${adminTargetPort}" | grep "Summary: all applications are active" if [ $? == 1 ]; then diff --git a/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh b/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh index f074a9eb3..411603060 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh @@ -12,7 +12,7 @@ function validate_app() { ${wlsDomainNS} \ ${wlsAdminSvcName} \ ${WLS_DOMAIN_USER} \ - ${WLS_DOMAIN_PASSWORD} \ + ${WLS_DOMAIN_SHIBBOLETH} \ ${scriptCheckAppStatus} } @@ -27,4 +27,4 @@ install_kubectl connect_aks $AKS_NAME $AKS_RESOURCE_GROUP_NAME -validate_app \ No newline at end of file +validate_app diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep index 6c4d3eea5..4b198a7f8 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep @@ -141,7 +141,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: string(enableCustomSSL) } { - name: 'ENABLE_PASSWORDLESS_DB_CONNECTION' + name: 'ENABLE_SHIBBOLETHLESS_DB_CONNECTION' value: string(enablePswlessConnection) } { @@ -157,7 +157,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: ocrSSOUser } { - name: 'ORACLE_ACCOUNT_PASSWORD' + name: 'ORACLE_ACCOUNT_SHIBBOLETH' secureValue: ocrSSOPSW } { @@ -189,7 +189,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: userProvidedImagePath } { - name: 'WLS_ADMIN_PASSWORD' + name: 'WLS_ADMIN_SHIBBOLETH' secureValue: wlsPassword } { @@ -241,7 +241,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers secureValue: wlsIdentityKeyStoreData } { - name: 'WLS_SSL_IDENTITY_PASSWORD' + name: 'WLS_SSL_IDENTITY_SHIBBOLETH' secureValue: wlsIdentityKeyStorePassphrase } { @@ -253,7 +253,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers secureValue: wlsTrustKeyStoreData } { - name: 'WLS_SSL_TRUST_PASSWORD' + name: 'WLS_SSL_TRUST_SHIBBOLETH' secureValue: wlsTrustKeyStorePassPhrase } { @@ -265,7 +265,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers secureValue: wlsPrivateKeyAlias } { - name: 'WLS_SSL_PRIVATE_KEY_PASSWORD' + name: 'WLS_SSL_PRIVATE_KEY_SHIBBOLETH' secureValue: wlsPrivateKeyPassPhrase } { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep index 19d5678d3..301d0c399 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep @@ -64,7 +64,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: dbConfigurationType } { - name: 'DB_PASSWORD' + name: 'DB_SHIBBOLETH' secureValue: dbPassword } { @@ -80,7 +80,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: dbDriverName } { - name: 'ENABLE_PASSWORDLESS_CONNECTION' + name: 'ENABLE_SHIBBOLETHLESS_CONNECTION' value: string(enablePswlessConnection) } { @@ -104,7 +104,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: wlsUserName } { - name: 'WLS_DOMAIN_PASSWORD' + name: 'WLS_DOMAIN_SHIBBOLETH' secureValue: wlsPassword } ] diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep index c3e6b5f37..6cf54e5cc 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep @@ -53,7 +53,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: wlsUserName } { - name: 'WLS_DOMAIN_PASSWORD' + name: 'WLS_DOMAIN_SHIBBOLETH' secureValue: wlsPassword } ] diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep index c865a2e6a..6b121526a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep @@ -76,7 +76,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: ocrSSOUser } { - name: 'ORACLE_ACCOUNT_PASSWORD' + name: 'ORACLE_ACCOUNT_SHIBBOLETH' secureValue: ocrSSOPSW } { @@ -120,7 +120,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers secureValue: sslUploadedCustomIdentityKeyStoreData } { - name: 'WLS_SSL_IDENTITY_PASSWORD' + name: 'WLS_SSL_IDENTITY_SHIBBOLETH' secureValue: sslUploadedCustomIdentityKeyStorePassphrase } { @@ -132,7 +132,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers secureValue: sslUploadedCustomTrustKeyStoreData } { - name: 'WLS_SSL_TRUST_PASSWORD' + name: 'WLS_SSL_TRUST_SHIBBOLETH' secureValue: sslUploadedCustomTrustKeyStorePassPhrase } { @@ -144,7 +144,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers secureValue: sslUploadedPrivateKeyAlias } { - name: 'WLS_SSL_PRIVATE_KEY_PASSWORD' + name: 'WLS_SSL_PRIVATE_KEY_SHIBBOLETH' secureValue: sslUploadedPrivateKeyPassPhrase } { @@ -152,7 +152,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: appGatewaySSLCertData } { - name: 'APPLICATION_GATEWAY_SSL_FRONTEND_CERT_PASSWORD' + name: 'APPLICATION_GATEWAY_SSL_FRONTEND_CERT_SHIBBOLETH' value: appGatewaySSLCertPassword } { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep index 3be6c611a..e9e29f633 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep @@ -75,7 +75,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: string(wlsClusterSize) } { - name: 'WLS_ADMIN_PASSWORD' + name: 'WLS_ADMIN_SHIBBOLETH' value: wlsPassword } { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep index 8f0623b14..edb36e12c 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep @@ -68,7 +68,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers value: ocrSSOUser } { - name: 'ORACLE_ACCOUNT_PASSWORD' + name: 'ORACLE_ACCOUNT_SHIBBOLETH' secureValue: ocrSSOPSW } { From 4bff3fd66271246d1eca1c55163f2effac8746a3 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Fri, 26 Sep 2025 12:48:14 +0000 Subject: [PATCH 2/5] hard-code pids for passwordchange-test --- .../src/main/arm/createUiDefinition.json | 32 ++-- .../src/main/bicep/mainTemplate.bicep | 34 ++-- .../src/main/bicep/modules/_appGateway.bicep | 4 +- .../bicep/modules/_azure-resoruces/_acr.bicep | 6 +- .../bicep/modules/_azure-resoruces/_aks.bicep | 12 +- .../_azure-resoruces/_aksPodIdentity.bicep | 2 +- .../_azure-resoruces/_appgateway.bicep | 10 +- .../_autoGeneratedPfxCertInKeyVault.bicep | 12 +- .../modules/_azure-resoruces/_dnsZones.bicep | 6 +- .../modules/_azure-resoruces/_storage.bicep | 8 +- .../_azure-resoruces/_vnetAppGateway.bicep | 14 +- .../_ds-create-networking.bicep | 6 +- .../_ds-create-wls-cluster.bicep | 8 +- .../_ds-datasource-connection.bicep | 6 +- .../_ds-output-domain-configurations.bicep | 6 +- .../_ds-validate-applications.bicep | 6 +- .../_ds-validate-parameters.bicep | 6 +- .../_deployment-scripts/_ds_enable_hpa.bicep | 6 +- .../_ds_enable_prometheus_metrics.bicep | 6 +- .../_ds_ensure_available_agic.bicep | 2 +- .../_ds_install_agic.bicep | 6 +- ...ery_available_private_ip_from_subnet.bicep | 6 +- .../_ds_update-applications.bicep | 2 +- .../_ds_validate_agic.bicep | 6 +- .../bicep/modules/_enableAutoScaling.bicep | 2 +- .../bicep/modules/_enablePromethuesKeda.bicep | 16 +- .../bicep/modules/_globalUamiAndRoles.bicep | 6 +- .../modules/_preDeployedAzureResources.bicep | 2 +- .../_agicNetworkContributor.bicep | 4 +- .../_agicRoleAssignment.bicep | 4 +- .../_aksClusterMioRoleOverDbIdentity.bicep | 6 +- .../_roleAssignmentinRgScope.bicep | 4 +- .../_roleAssignmentinSubscription.bicep | 4 +- .../bicep/modules/_setupDBConnection.bicep | 2 +- .../_setupPasswordlessDBConnection.bicep | 4 +- .../src/main/bicep/modules/networking.bicep | 2 +- .../bicep/modules/setupWebLogicCluster.bicep | 4 +- .../src/main/arm/mainTemplate.json | 6 +- .../src/main/arm/createUiDefinition.json | 26 +-- .../src/main/arm/mainTemplate.json | 86 ++++----- .../_appendUserManagedIdentity.json | 2 +- .../main/arm/nestedtemplates/_dbTemplate.json | 42 ++--- .../_dnszones/_createDNSZonesTemplate.json | 10 +- .../_dnszones/_uamiAndRoleAssignment.json | 12 +- .../_dnszones/_updateDNSZonesTemplate.json | 12 +- .../_installJdbcLibsTemplate.json | 6 +- .../nestedtemplates/_pswlessDbTemplate.json | 30 ++-- .../arm/nestedtemplates/adminTemplate.json | 136 +++++++-------- .../adminTemplateForCustomSSL.json | 148 ++++++++-------- .../main/arm/nestedtemplates/dbTemplate.json | 14 +- .../arm/nestedtemplates/dnszonesTemplate.json | 24 +-- .../nestedtemplates/nsgNestedTemplate.json | 4 +- .../postDeploymentTemplate.json | 6 +- .../postDeploymentUAMIRolesTemplate.json | 10 +- .../src/main/arm/mainTemplate.json | 22 +-- .../addnode/src/main/arm/mainTemplate.json | 24 +-- .../src/main/arm/createUiDefinition.json | 32 ++-- .../src/main/arm/mainTemplate.json | 118 ++++++------- .../_appGatewayConnectorTemplate.json | 24 +-- .../_appendUserManagedIdentity.json | 2 +- .../main/arm/nestedtemplates/_dbTemplate.json | 42 ++--- .../_dnszones/_createDNSZonesTemplate.json | 10 +- .../_dnszones/_uamiAndRoleAssignment.json | 12 +- .../_dnszones/_updateDNSZonesTemplate.json | 12 +- .../_installJdbcLibsTemplate.json | 6 +- .../_keyvaultWithNewCertTemplate.json | 18 +- .../nestedtemplates/_pswlessDbTemplate.json | 30 ++-- .../appGatewayNestedTemplate.json | 36 ++-- .../clusterCustomSSLTemplate.json | 164 +++++++++--------- .../arm/nestedtemplates/clusterTemplate.json | 152 ++++++++-------- .../nestedtemplates/coherenceTemplate.json | 36 ++-- .../main/arm/nestedtemplates/dbTemplate.json | 14 +- .../arm/nestedtemplates/dnszonesTemplate.json | 22 +-- .../nestedtemplates/nsgNestedTemplate.json | 8 +- .../postDeploymentTemplate.json | 8 +- .../postDeploymentUAMIRolesTemplate.json | 18 +- .../deletenode/src/main/arm/mainTemplate.json | 10 +- .../src/main/arm/mainTemplate.json | 22 +-- .../addnode/src/main/arm/mainTemplate.json | 22 +-- .../src/main/arm/createUiDefinition.json | 2 +- .../src/main/arm/mainTemplate.json | 54 +++--- .../_appendUserManagedIdentity.json | 2 +- .../main/arm/nestedtemplates/_dbTemplate.json | 26 +-- .../_dnszones/_createDNSZonesTemplate.json | 6 +- .../_dnszones/_uamiAndRoleAssignment.json | 6 +- .../_dnszones/_updateDNSZonesTemplate.json | 6 +- .../_installJdbcLibsTemplate.json | 4 +- .../nestedtemplates/_pswlessDbTemplate.json | 18 +- .../clusterCustomSSLTemplate.json | 108 ++++++------ .../arm/nestedtemplates/clusterTemplate.json | 100 +++++------ .../nestedtemplates/coherenceTemplate.json | 22 +-- .../main/arm/nestedtemplates/dbTemplate.json | 6 +- .../arm/nestedtemplates/dnszonesTemplate.json | 12 +- .../nestedtemplates/nsgNestedTemplate.json | 8 +- .../nestedtemplates/ohsNestedTemplate.json | 20 +-- .../postDeploymentTemplate.json | 2 +- .../postDeploymentUAMIRolesTemplate.json | 6 +- .../deletenode/src/main/arm/mainTemplate.json | 10 +- .../src/main/arm/createUiDefinition.json | 16 +- .../src/main/arm/mainTemplate.json | 154 ++++++++-------- 100 files changed, 1149 insertions(+), 1149 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 7600b9c04..02814a8ba 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -2078,22 +2078,22 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "${identifier.managedClusters}", - "${identifier.applicationGateways}", - "${identifier.registries}", - "${identifier.virtualMachines}", - "${identifier.virtualMachinesExtensions}", - "${identifier.virtualNetworks}", - "${identifier.networkInterfaces}", - "${identifier.networkSecurityGroups}", - "${identifier.publicIPAddresses}", - "${identifier.storageAccounts}", - "${identifier.vaults}", - "${identifier.userAssignedIdentities}", - "${identifier.dnszones}", - "${identifier.workspaces}", - "${identifier.accounts}", - "${identifier.deploymentScripts}" + "Microsoft.ContainerService/managedClusters", + "Microsoft.Network/applicationGateways", + "Microsoft.ContainerRegistry/registries", + "Microsoft.Compute/virtualMachines", + "Virtual machine extension", + "Microsoft.Network/virtualNetworks", + "Microsoft.Network/networkInterfaces", + "Microsoft.Network/networkSecurityGroups", + "Microsoft.Network/publicIPAddresses", + "Microsoft.Storage/storageAccounts", + "Microsoft.KeyVault/vaults", + "Microsoft.ManagedIdentity/userAssignedIdentities", + "Microsoft.Network/dnszones", + "Microsoft.OperationalInsights/workspaces", + "Microsoft.Monitor/accounts", + "Microsoft.Resources/deploymentScripts" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep index ad7c7a5fa..e48eaba5f 100644 --- a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep +++ b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep @@ -199,7 +199,7 @@ param sslUploadedPrivateKeyAlias string = newGuid() @secure() @description('Password of the private key') param sslUploadedPrivateKeyPassPhrase string = newGuid() -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object = {} @description('Public port of the custom T3 channel in admin server') param t3ChannelAdminPort int = 7005 @@ -266,22 +266,22 @@ var _enableAppGWIngress = enableAppGWIngress // We can streamline the following code with a user-defined function, but it is not supported in Partner Center. // For status, see https://dev.azure.com/edburns-msft/Open%20Standard%20Enterprise%20Java%20(Java%20EE)%20on%20Azure/_workitems/edit/6219 var _objTagsByResource = { - '${identifier.accounts}': contains(tagsByResource, '${identifier.accounts}') ? tagsByResource['${identifier.accounts}'] : json('{}') - '${identifier.managedClusters}': contains(tagsByResource, '${identifier.managedClusters}') ? tagsByResource['${identifier.managedClusters}'] : json('{}') - '${identifier.applicationGateways}': contains(tagsByResource, '${identifier.applicationGateways}') ? tagsByResource['${identifier.applicationGateways}'] : json('{}') - '${identifier.registries}': contains(tagsByResource, '${identifier.registries}') ? tagsByResource['${identifier.registries}'] : json('{}') - '${identifier.virtualMachines}': contains(tagsByResource, '${identifier.virtualMachines}') ? tagsByResource['${identifier.virtualMachines}'] : json('{}') - '${identifier.virtualMachinesExtensions}': contains(tagsByResource, '${identifier.virtualMachinesExtensions}') ? tagsByResource['${identifier.virtualMachinesExtensions}'] : json('{}') - '${identifier.virtualNetworks}': contains(tagsByResource, '${identifier.virtualNetworks}') ? tagsByResource['${identifier.virtualNetworks}'] : json('{}') - '${identifier.networkInterfaces}': contains(tagsByResource, '${identifier.networkInterfaces}') ? tagsByResource['${identifier.networkInterfaces}'] : json('{}') - '${identifier.networkSecurityGroups}': contains(tagsByResource, '${identifier.networkSecurityGroups}') ? tagsByResource['${identifier.networkSecurityGroups}'] : json('{}') - '${identifier.publicIPAddresses}': contains(tagsByResource, '${identifier.publicIPAddresses}') ? tagsByResource['${identifier.publicIPAddresses}'] : json('{}') - '${identifier.storageAccounts}': contains(tagsByResource, '${identifier.storageAccounts}') ? tagsByResource['${identifier.storageAccounts}'] : json('{}') - '${identifier.vaults}': contains(tagsByResource, '${identifier.vaults}') ? tagsByResource['${identifier.vaults}'] : json('{}') - '${identifier.userAssignedIdentities}': contains(tagsByResource, '${identifier.userAssignedIdentities}') ? tagsByResource['${identifier.userAssignedIdentities}'] : json('{}') - '${identifier.dnszones}': contains(tagsByResource, '${identifier.dnszones}') ? tagsByResource['${identifier.dnszones}'] : json('{}') - '${identifier.workspaces}': contains(tagsByResource, '${identifier.workspaces}') ? tagsByResource['${identifier.workspaces}'] : json('{}') - '${identifier.deploymentScripts}': contains(tagsByResource, '${identifier.deploymentScripts}') ? tagsByResource['${identifier.deploymentScripts}'] : json('{}') + 'Microsoft.Monitor/accounts': contains(tagsByResource, 'Microsoft.Monitor/accounts') ? tagsByResource['Microsoft.Monitor/accounts'] : json('{}') + 'Microsoft.ContainerService/managedClusters': contains(tagsByResource, 'Microsoft.ContainerService/managedClusters') ? tagsByResource['Microsoft.ContainerService/managedClusters'] : json('{}') + 'Microsoft.Network/applicationGateways': contains(tagsByResource, 'Microsoft.Network/applicationGateways') ? tagsByResource['Microsoft.Network/applicationGateways'] : json('{}') + 'Microsoft.ContainerRegistry/registries': contains(tagsByResource, 'Microsoft.ContainerRegistry/registries') ? tagsByResource['Microsoft.ContainerRegistry/registries'] : json('{}') + 'Microsoft.Compute/virtualMachines': contains(tagsByResource, 'Microsoft.Compute/virtualMachines') ? tagsByResource['Microsoft.Compute/virtualMachines'] : json('{}') + 'Virtual machine extension': contains(tagsByResource, 'Virtual machine extension') ? tagsByResource['Virtual machine extension'] : json('{}') + 'Microsoft.Network/virtualNetworks': contains(tagsByResource, 'Microsoft.Network/virtualNetworks') ? tagsByResource['Microsoft.Network/virtualNetworks'] : json('{}') + 'Microsoft.Network/networkInterfaces': contains(tagsByResource, 'Microsoft.Network/networkInterfaces') ? tagsByResource['Microsoft.Network/networkInterfaces'] : json('{}') + 'Microsoft.Network/networkSecurityGroups': contains(tagsByResource, 'Microsoft.Network/networkSecurityGroups') ? tagsByResource['Microsoft.Network/networkSecurityGroups'] : json('{}') + 'Microsoft.Network/publicIPAddresses': contains(tagsByResource, 'Microsoft.Network/publicIPAddresses') ? tagsByResource['Microsoft.Network/publicIPAddresses'] : json('{}') + 'Microsoft.Storage/storageAccounts': contains(tagsByResource, 'Microsoft.Storage/storageAccounts') ? tagsByResource['Microsoft.Storage/storageAccounts'] : json('{}') + 'Microsoft.KeyVault/vaults': contains(tagsByResource, 'Microsoft.KeyVault/vaults') ? tagsByResource['Microsoft.KeyVault/vaults'] : json('{}') + 'Microsoft.ManagedIdentity/userAssignedIdentities': contains(tagsByResource, 'Microsoft.ManagedIdentity/userAssignedIdentities') ? tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] : json('{}') + 'Microsoft.Network/dnszones': contains(tagsByResource, 'Microsoft.Network/dnszones') ? tagsByResource['Microsoft.Network/dnszones'] : json('{}') + 'Microsoft.OperationalInsights/workspaces': contains(tagsByResource, 'Microsoft.OperationalInsights/workspaces') ? tagsByResource['Microsoft.OperationalInsights/workspaces'] : json('{}') + 'Microsoft.Resources/deploymentScripts': contains(tagsByResource, 'Microsoft.Resources/deploymentScripts') ? tagsByResource['Microsoft.Resources/deploymentScripts'] : json('{}') } var const_aksName = createAKSCluster ? 'wlsonaks${const_globalResourceNameSuffix}' : aksClusterName var const_appGatewaySSLCertOptionGenerateCert = 'generateCert' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep index 3c35a64ce..b3c46ab28 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep @@ -32,7 +32,7 @@ param trustedRootCertificateDeploymentName string @secure() param vnetForApplicationGateway object param vnetRGNameForApplicationGateway string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object // To mitigate arm-ttk error: Type Mismatch: Parameter in nested template is defined as string, but the parent template defines it as bool. @@ -59,7 +59,7 @@ module pidAppgwWithCustomCertificate './_pids/_pid.bicep' = if (_signedFrontendC } // get key vault object from a resource group -resource existingKeyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' existing = { +resource existingKeyvault 'Microsoft.KeyVault/vaults@2024-11-01' existing = { name: autoGeneratedSSLCertKeyVaultName } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep index 297f81567..f65a72d73 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep @@ -3,10 +3,10 @@ param acrName string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object -resource registries 'Microsoft.ContainerRegistry/registries@${azure.apiVersionForContainerRegistries}' = { +resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = { name: acrName location: location sku: { @@ -37,7 +37,7 @@ resource registries 'Microsoft.ContainerRegistry/registries@${azure.apiVersionFo zoneRedundancy: 'Disabled' anonymousPullEnabled: false } - tags: tagsByResource['${identifier.registries}'] + tags: tagsByResource['Microsoft.ContainerRegistry/registries'] } output acrName string = acrName diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep index 021434135..5a3ffeb27 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep @@ -25,7 +25,7 @@ param aksVersion string = 'default' @description('In addition to the CPU and memory metrics included in AKS by default, you can enable Container Insights for more comprehensive data on the overall performance and health of your cluster. Billing is based on data ingestion and retention settings.') param enableAzureMonitoring bool = false param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -42,10 +42,10 @@ var obj_aciEnableOmsAgent = { } } -resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@${azure.apiVersionForInsightsWorkspaces}' = if (enableAzureMonitoring) { +resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = if (enableAzureMonitoring) { name: name_aciWorkspace location: location - tags: tagsByResource['${identifier.workspaces}'] + tags: tagsByResource['Microsoft.OperationalInsights/workspaces'] properties: { sku: { name: aciWorkspaceSku @@ -59,10 +59,10 @@ resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@${az } } -resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = { name: aksClusterName location: location - tags: tagsByResource['${identifier.managedClusters}'] + tags: tagsByResource['Microsoft.ContainerService/managedClusters'] properties: { kubernetesVersion: aksVersion dnsPrefix: '${aksClusterName}-dns' @@ -81,7 +81,7 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersi availabilityZones: agentAvailabilityZones mode: 'System' osType: 'Linux' - tags: tagsByResource['${identifier.managedClusters}'] + tags: tagsByResource['Microsoft.ContainerService/managedClusters'] } ] addonProfiles: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep index 9b440d89f..09a711300 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep @@ -12,7 +12,7 @@ param location string var const_APIVersion = '2022-01-31-PREVIEW' -resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { +resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@2023-08-01' = { name: aksClusterName location: location properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep index beaa9cad8..ef8243796 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep @@ -20,7 +20,7 @@ param staticPrivateFrontentIP string = '10.0.0.1' @secure() param trustedRootCertData string = newGuid() param usePrivateIP bool = false -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -80,13 +80,13 @@ var obj_tagIngress = { 'managed-by-k8s-ingress': 'true' } -resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@${azure.apiVersionForPublicIPAddresses}' = { +resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = { name: gatewayPublicIPAddressName sku: { name: 'Standard' } location: location - tags: tagsByResource['${identifier.publicIPAddresses}'] + tags: tagsByResource['Microsoft.Network/publicIPAddresses'] properties: { publicIPAllocationMethod: 'Static' dnsSettings: { @@ -95,10 +95,10 @@ resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@${azure.apiVersion } } -resource wafv2AppGateway 'Microsoft.Network/applicationGateways@${azure.apiVersionForApplicationGateways}' = { +resource wafv2AppGateway 'Microsoft.Network/applicationGateways@2023-06-01' = { name: gatewayName location: location - tags: union(tagsByResource['${identifier.applicationGateways}'], obj_tagIngress) + tags: union(tagsByResource['Microsoft.Network/applicationGateways'], obj_tagIngress) properties: { sku: { name: 'WAF_v2' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep index c7f4022f2..09de338b4 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep @@ -28,7 +28,7 @@ param sku string = 'Standard' @description('Subject name to create a new certificate, example: \'CN=contoso.com\'.') param subjectName string = 'contoso.xyz' -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -37,10 +37,10 @@ var obj_extraTag= { } var const_identityId = '${substring(string(identity.userAssignedIdentities), indexOf(string(identity.userAssignedIdentities), '"') + 1, lastIndexOf(string(identity.userAssignedIdentities), '"') - (indexOf(string(identity.userAssignedIdentities), '"') + 1))}' -resource keyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' = { +resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = { name: keyVaultName location: location - tags: union(tagsByResource['${identifier.vaults}'], obj_extraTag) + tags: union(tagsByResource['Microsoft.KeyVault/vaults'], obj_extraTag) properties: { sku: { family: 'A' @@ -63,15 +63,15 @@ resource keyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' = { } } -resource createAddCertificate 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource createAddCertificate 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-create-add-appgw-certificate-${_globalResourceNameSuffix}' location: location identity: identity kind: 'AzurePowerShell' - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { forceUpdateTag: utcValue - azPowerShellVersion: '${azure.powershell.version}' + azPowerShellVersion: '11.5' timeout: 'PT30M' arguments: ' -vaultName ${keyVaultName} -certificateName ${secretName} -subjectName ${subjectName}' scriptContent: '\n param(\n [string] [Parameter(Mandatory=$true)] $vaultName,\n [string] [Parameter(Mandatory=$true)] $certificateName,\n [string] [Parameter(Mandatory=$true)] $subjectName\n )\n\n $ErrorActionPreference = \'Stop\'\n $DeploymentScriptOutputs = @{}\n\n $existingCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n if ($existingCert -and $existingCert.Certificate.Subject -eq $subjectName) {\n\n Write-Host \'Certificate $certificateName in vault $vaultName is already present.\'\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $existingCert.Thumbprint\n $existingCert | Out-String\n }\n else {\n $policy = New-AzKeyVaultCertificatePolicy -SubjectName $subjectName -IssuerName Self -ValidityInMonths 12 -Verbose\n\n # private key is added as a secret that can be retrieved in the ARM template\n Add-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName -CertificatePolicy $policy -Verbose\n\n $newCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n # it takes a few seconds for KeyVault to finish\n $tries = 0\n do {\n Write-Host \'Waiting for certificate creation completion...\'\n Start-Sleep -Seconds 10\n $operation = Get-AzKeyVaultCertificateOperation -VaultName $vaultName -Name $certificateName\n $tries++\n\n if ($operation.Status -eq \'failed\')\n {\n throw \'Creating certificate $certificateName in vault $vaultName failed with error $($operation.ErrorMessage)\'\n }\n\n if ($tries -gt 120)\n {\n throw \'Timed out waiting for creation of certificate $certificateName in vault $vaultName\'\n }\n } while ($operation.Status -ne \'completed\')\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $newCert.Thumbprint\n $newCert | Out-String\n }\n ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep index 18f740809..389aedea9 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep @@ -1,12 +1,12 @@ @description('Azure DNS Zone name.') param dnszoneName string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object -resource dnszoneName_resource 'Microsoft.Network/dnszones@${azure.apiVersionForDNSZone}' = { +resource dnszoneName_resource 'Microsoft.Network/dnszones@2023-07-01-preview' = { name: dnszoneName location: 'global' - tags: tagsByResource['${identifier.dnszones}'] + tags: tagsByResource['Microsoft.Network/dnszones'] properties: { zoneType: 'Public' } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep index 009b1a669..741c31969 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep @@ -4,7 +4,7 @@ param fileShareName string param location string param storageAccountName string = 'stg-contoso' -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -14,11 +14,11 @@ var obj_extraTag = { 'created-by-azure-weblogic': utcValue } -resource storageAccount 'Microsoft.Storage/storageAccounts@${azure.apiVersionForStorage}' = { +resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = { name: storageAccountName location: location kind: 'StorageV2' - tags: union(tagsByResource['${identifier.storageAccounts}'], obj_extraTag) + tags: union(tagsByResource['Microsoft.Storage/storageAccounts'], obj_extraTag) sku: { name: const_sku tier: 'Standard' @@ -42,7 +42,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@${azure.apiVersionFor } } -resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@${azure.apiVersionForStorageFileService}' = { +resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@2025-01-01' = { name: '${storageAccount.name}/default/${fileShareName}' properties: { accessTier: 'TransactionOptimized' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep index 2a5badc4e..d2e75ab0d 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep @@ -19,7 +19,7 @@ param vnetForApplicationGateway object = { } } } -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -30,22 +30,22 @@ var name_subnet = vnetForApplicationGateway.subnets.gatewaySubnet.name var name_vnet = vnetForApplicationGateway.name // Get existing VNET. -resource existingVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { +resource existingVnet 'Microsoft.Network/virtualNetworks@2023-06-01' existing = if (!const_newVnet) { name: name_vnet scope: resourceGroup(vnetForApplicationGateway.resourceGroup) } // Get existing subnet. -resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { +resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@2023-06-01' existing = if (!const_newVnet) { name: name_subnet parent: existingVnet } // Create new network security group. -resource nsg 'Microsoft.Network/networkSecurityGroups@${azure.apiVersionForNetworkSecurityGroups}' = if (const_newVnet) { +resource nsg 'Microsoft.Network/networkSecurityGroups@2023-06-01' = if (const_newVnet) { name: nsgName location: location - tags: tagsByResource['${identifier.networkSecurityGroups}'] + tags: tagsByResource['Microsoft.Network/networkSecurityGroups'] properties: { securityRules: [ { @@ -82,10 +82,10 @@ resource nsg 'Microsoft.Network/networkSecurityGroups@${azure.apiVersionForNetwo } // Create new VNET and subnet. -resource newVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' = if (const_newVnet) { +resource newVnet 'Microsoft.Network/virtualNetworks@2023-06-01' = if (const_newVnet) { name: name_vnet location: location - tags: tagsByResource['${identifier.virtualNetworks}'] + tags: tagsByResource['Microsoft.Network/virtualNetworks'] properties: { addressSpace: { addressPrefixes: const_vnetAddressPrefixes diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep index 901fe4f83..a4338eb17 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep @@ -35,7 +35,7 @@ param useInternalLB bool = false param utcValue string = utcNow() param wlsDomainName string = 'domain1' param wlsDomainUID string = 'sample-domain1' -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object var const_commonScript = 'common.sh' @@ -46,12 +46,12 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_primaryScript = 'setupNetworking.sh' var const_utilityScript = 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-networking-deployment-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep index 4b198a7f8..a2d16bba3 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep @@ -31,7 +31,7 @@ param managedServerPrefix string = 'managed-server' param ocrSSOPSW string param ocrSSOUser string param storageAccountName string = 'null' -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 @@ -83,12 +83,12 @@ var const_setUpDomainScript = 'setupWLSDomain.sh' var const_updateDomainConfigScript= 'updateDomainConfig.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-cluster-creation-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ @@ -174,7 +174,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers } { name: 'TAG_VM' - value: string(tagsByResource['${identifier.virtualMachines}']) + value: string(tagsByResource['Microsoft.Compute/virtualMachines']) } { name: 'URL_3RD_DATASOURCE' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep index 301d0c399..c47e77f5e 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep @@ -22,7 +22,7 @@ param enablePswlessConnection bool = false param identity object = {} param jdbcDataSourceName string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -38,12 +38,12 @@ var const_dbUtilityScript='dbUtility.sh' var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-db-connection-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep index d86fc1353..e65e34621 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep @@ -7,7 +7,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() param wlsClusterName string = 'cluster-1' @@ -18,12 +18,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryDomainConfigurations = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryDomainConfigurations.sh') var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-query-wls-configurations-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep index 6cf54e5cc..63e6b19fa 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep @@ -11,7 +11,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -27,12 +27,12 @@ var const_utilityScript= 'utility.sh' var const_commonScript= 'common.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-validate-applications-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep index 6b121526a..fde517ae3 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep @@ -42,7 +42,7 @@ param sslUploadedCustomTrustKeyStoreType string param sslUploadedPrivateKeyAlias string @secure() param sslUploadedPrivateKeyPassPhrase string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param useAksWellTestedVersion bool = true param userProvidedAcr string @@ -61,12 +61,12 @@ var const_arguments = '${location} ${createAKSCluster} ${aksAgentPoolVMSize} ${a var const_checkDNSZone = enableDNSConfiguration && !createDNSZone var const_deploymentName = 'ds-validate-parameters-and-fail-fast-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion arguments: const_arguments diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep index ec3571b0f..327013c65 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep @@ -12,7 +12,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() param utilizationPercentage int @@ -25,12 +25,12 @@ var base64_enableHpa = loadFileAsBase64('../../../arm/scripts/inline-scripts/ena var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-enable-hpa-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep index e9e29f633..75032eed7 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep @@ -9,7 +9,7 @@ param azCliVersion string param identity object = {} param kedaUamiName string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -28,12 +28,12 @@ var const_deploymentName = 'ds-enable-promethues-metrics-${_globalResourceNameSu var const_kedaNamespace= 'keda' var const_kedaSa= 'keda-operator' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}', base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep index e42042a66..8a84a0818 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep @@ -15,7 +15,7 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep index fc355f699..b5f9c1d69 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep @@ -8,7 +8,7 @@ param appgwName string = 'appgw-contoso' param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -18,12 +18,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-install-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep index ea3ad9025..0264ccd74 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep @@ -7,7 +7,7 @@ param knownIP string = '10.0.0.1' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -16,12 +16,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryPrivateIPForAppGateway = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryPrivateIPForAppGateway.sh') var const_deploymentName = 'ds-query-private-ip-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}', base64ToString(base64_common), base64ToString(base64_queryPrivateIPForAppGateway)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep index edb36e12c..10ae1768f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep @@ -35,7 +35,7 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_updateAppScript= 'updateApplications.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-update-applications-${uniqueString(utcValue)}' location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep index 437ac0128..08101e281 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep @@ -7,7 +7,7 @@ param aksClusterRGName string param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @@ -17,12 +17,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/va var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep index 59d78778a..e94bb5bf2 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep @@ -21,7 +21,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param useHpa bool param utilizationPercentage int diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep index fc5aa1a2e..ef5efa967 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep @@ -8,7 +8,7 @@ param aksClusterRGName string param azCliVersion string param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -24,32 +24,32 @@ var name_azureMonitorAccountName = 'ama${_globalResourceNameSuffix}' var name_kedaUserDefinedManagedIdentity = 'kedauami${_globalResourceNameSuffix}' var name_kedaMonitorDataReaderRoleAssignmentName = guid('${resourceGroup().id}${name_kedaUserDefinedManagedIdentity}${_globalResourceNameSuffix}') -resource monitorAccount 'Microsoft.Monitor/accounts@${azure.apiVersionForMonitorAccount}' = { +resource monitorAccount 'Microsoft.Monitor/accounts@2023-04-03' = { name: name_azureMonitorAccountName location: location properties: {} - tags: tagsByResource['${identifier.accounts}'] + tags: tagsByResource['Microsoft.Monitor/accounts'] } // UAMI for KEDA -resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { +resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { name: name_kedaUserDefinedManagedIdentity location: location - tags: tagsByResource['${identifier.userAssignedIdentities}'] + tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] } // Get role resource id -resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: const_roleDefinitionIdOfMonitorDataReader } // Assign Monitor Data Reader role we need the permission to read data. -resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_kedaMonitorDataReaderRoleAssignmentName scope: monitorAccount properties: { description: 'Assign Monitor Data Reader role role to KEDA Identity ' - principalId: reference(uamiForKeda.id, '${azure.apiVersionForIdentity}', 'full').properties.principalId + principalId: reference(uamiForKeda.id, '2023-01-31', 'full').properties.principalId principalType: 'ServicePrincipal' roleDefinitionId: monitorDataReaderResourceDefinition.id } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep index e5acfe269..b27976c15 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep @@ -5,7 +5,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param _globalResourceNameSuffix string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param name_deploymentScriptContributorRoleAssignmentName string = newGuid() @@ -14,10 +14,10 @@ var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' var name_deploymentScriptUserDefinedManagedIdentity = 'wls-aks-deployment-script-user-defined-managed-itentity-${_globalResourceNameSuffix}' // UAMI for deployment script -resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { +resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { name: name_deploymentScriptUserDefinedManagedIdentity location: location - tags: tagsByResource['${identifier.userAssignedIdentities}'] + tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] } // Assign Contributor role in subscription scope, we need the permission to get/update resource cross resource group. diff --git a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep index 0790d55a1..d8439896a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep @@ -6,7 +6,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param acrName string = 'acr-contoso' param acrResourceGroupName string = 'acr-contoso-rg' param createNewAcr bool = false -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param location string diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep index e2bc8bed0..1f8666c37 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfVnetContributor = '4d97b98b-1d4f-4787-a291-c67834d212e7' -resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Network Contributor role to AGIC Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep index 85f56df12..5b8fa06a6 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' -resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Resource Group Contributor role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep index 514d47094..5aaad7ff0 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep @@ -10,17 +10,17 @@ param dbIdentityName string = '' var const_roleDefinitionIdOfManagedIdentityOperator = 'f1a07417-d97a-45cb-824c-7a7467783830' var name_roleAssignmentName = guid('${subscription().id}${clusterIdentityPrincipalId}Role assignment in resource scope') -resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' existing = { +resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = { name: dbIdentityName } // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: const_roleDefinitionIdOfManagedIdentityOperator } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_roleAssignmentName scope: dbIdentityResource properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep index f5b50c20d..ec44876f3 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep @@ -25,12 +25,12 @@ var const_identityAPIVersion = '2022-01-31-PREVIEW' var name_roleAssignmentName = guid('${subscription().id}${_globalResourceNameSuffix}Role assignment in resource group scope') // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_roleAssignmentName properties: { description: 'Assign resource group scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep index 9c27fb507..c886338c6 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep @@ -25,12 +25,12 @@ param principalId string = '' var name_roleAssignmentName = guid('${subscription().id}${principalId}Role assignment in subscription scope') // Get role resource id in subscription -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_roleAssignmentName properties: { description: 'Assign subscription scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep index fb2a44eed..6cac83700 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep @@ -41,7 +41,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object @description('UID of WebLogic domain, used in WebLogic Operator.') param wlsDomainUID string = 'sample-domain1' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep index 3b88c7872..1218706de 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep @@ -35,7 +35,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param utcValue string = utcNow() @description('UID of WebLogic domain, used in WebLogic Operator.') @@ -93,7 +93,7 @@ module dbIdentityVMContributorRoleAssignment '_rolesAssignment/_roleAssignmentin } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } diff --git a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep index 47374ba3f..a1cab35be 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep @@ -49,7 +49,7 @@ param location string param lbSvcValues array = [] param newOrExistingVnetForApplicationGateway string param vnetRGNameForApplicationGateway string -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object @description('True to set up internal load balancer service.') param useInternalLB bool = false diff --git a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep index 47666bdee..5ffc7c2b0 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep @@ -84,7 +84,7 @@ param ocrSSOUser string param storageAccountName string = 'stg-contoso' param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 -@description('${label.tagsLabel}') +@description('Tags for the resources.') param tagsByResource object param userProvidedAcr string = 'null' param userProvidedAcrRgName string = 'null' @@ -149,7 +149,7 @@ module pidSSLStart './_pids/_pid.bicep' = if (enableCustomSSL) { } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = if (!createAKSCluster) { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = if (!createAKSCluster) { name: aksClusterName scope: resourceGroup(aksClusterRGName) } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json index 77f835f0b..5abdc5abb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json @@ -92,7 +92,7 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "${post.deploy.ssl.config.start}", "properties": { "mode": "Incremental", @@ -106,7 +106,7 @@ { "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "location": "[parameters('location')]", "properties": { "publisher": "Microsoft.Azure.Extensions", @@ -126,7 +126,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "${post.deploy.ssl.config.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json index 0b231770b..d75861ed1 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json @@ -94,7 +94,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - ${azure.armBased.vmSize.list} + "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" ] }, "osPlatform": "Linux", @@ -1020,18 +1020,18 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "${identifier.dnszones}", - "${identifier.networkInterfaces}", - "${identifier.networkSecurityGroups}", - "${identifier.publicIPAddresses}", - "${identifier.privateEndpoints}", - "${identifier.storageAccounts}", - "${identifier.virtualNetworks}", - "${identifier.virtualMachines}", - "${identifier.virtualMachinesExtensions}", - "${identifier.deploymentScripts}", - "${identifier.userAssignedIdentities}", - "${identifier.resourcesDeployment}" + "Microsoft.Network/dnszones", + "Microsoft.Network/networkInterfaces", + "Microsoft.Network/networkSecurityGroups", + "Microsoft.Network/publicIPAddresses", + "Microsoft.Network/privateEndpoints", + "Microsoft.Storage/storageAccounts", + "Microsoft.Network/virtualNetworks", + "Microsoft.Compute/virtualMachines", + "Virtual machine extension", + "Microsoft.Resources/deploymentScripts", + "Microsoft.ManagedIdentity/userAssignedIdentities", + "Microsoft resources deployment" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json index 0775fbd38..14ce7f3ca 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json @@ -346,7 +346,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsDomainName": { @@ -387,18 +387,18 @@ // If adding a new resource, add the resource identifier to the array below // Also modify createUIDefinition.json to include the new resource "obj_tagsByResources":{ - "${identifier.dnszones}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.dnszones}')]", - "${identifier.networkInterfaces}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkInterfaces}')]", - "${identifier.networkSecurityGroups}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkSecurityGroups}')]", - "${identifier.publicIPAddresses}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.publicIPAddresses}')]", - "${identifier.privateEndpoints}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.privateEndpoints}')]", - "${identifier.storageAccounts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.storageAccounts}')]", - "${identifier.virtualNetworks}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualNetworks}')]", - "${identifier.virtualMachines}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]", - "${identifier.virtualMachinesExtensions}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachinesExtensions}')]", - "${identifier.deploymentScripts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.deploymentScripts}')]", - "${identifier.userAssignedIdentities}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.userAssignedIdentities}')]", - "${identifier.resourcesDeployment}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.resourcesDeployment}')]" + "Microsoft.Network/dnszones": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/dnszones')]", + "Microsoft.Network/networkInterfaces": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces')]", + "Microsoft.Network/networkSecurityGroups": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkSecurityGroups')]", + "Microsoft.Network/publicIPAddresses": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses')]", + "Microsoft.Network/privateEndpoints": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/privateEndpoints')]", + "Microsoft.Storage/storageAccounts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts')]", + "Microsoft.Network/virtualNetworks": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks')]", + "Microsoft.Compute/virtualMachines": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/virtualMachines')]", + "Virtual machine extension": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Virtual machine extension')]", + "Microsoft.Resources/deploymentScripts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Resources/deploymentScripts')]", + "Microsoft.ManagedIdentity/userAssignedIdentities": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.ManagedIdentity/userAssignedIdentities')]", + "Microsoft resources deployment": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft resources deployment')]" } }, "functions": [ @@ -429,9 +429,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", - "name": "${admin.start}", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "name": "pid-7e52c2b6-1acb-416f-af55-5837ff783eb7-partnercenter", "properties": { "mode": "Incremental", "template": { @@ -445,8 +445,8 @@ { "name": "adminLinkedTemplate", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", - "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "2023-07-01", "condition": "[not(parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -548,8 +548,8 @@ { "name": "adminCustomSSLLinkedTemplate", "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "condition": "[parameters('enableCustomSSL')]", "properties": { "mode": "Incremental", @@ -677,8 +677,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "networkSecurityLinkedTemplate", "properties": { @@ -703,9 +703,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "dnszonesLinkedTemplate", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "condition": "[and(parameters('enableCustomDNS'), equals(parameters('virtualNetworkNewOrExisting'), 'new'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]" @@ -745,7 +745,7 @@ }, "targetResources": { "value": [ - "[reference(variables('name_adminLinkedTemplateDeployment'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value]" + "[reference(variables('name_adminLinkedTemplateDeployment'), '2023-07-01').outputs._adminPublicIPId.value]" ] }, "tagsByResource": { @@ -760,8 +760,8 @@ "[resourceId('Microsoft.Resources/deployments', 'dnszonesLinkedTemplate')]" ], "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", - "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "2023-07-01", "condition": "[parameters('enableDB')]", "properties": { "mode": "Incremental", @@ -824,10 +824,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_uamiForPostDeploymentScript')]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('name_adminLinkedTemplateDeployment'))]", "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]", @@ -855,10 +855,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "postDeplyment", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('name_adminLinkedTemplateDeployment'))]", "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]", @@ -892,16 +892,16 @@ "value": "[parameters('_artifactsLocationSasToken')]" }, "userAssignedIdentityResourceId":{ - "value": "[reference(variables('name_uamiForPostDeploymentScript'),'${azure.apiVersionForDeployment}').outputs.uamidForPostDeployment.value]" + "value": "[reference(variables('name_uamiForPostDeploymentScript'),'2023-07-01').outputs.uamidForPostDeployment.value]" } } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", - "name": "${admin.end}", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "name": "057f09cd-6f90-5c1c-b655-3aba168aef35", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('name_adminLinkedTemplateDeployment'))]", "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]", @@ -928,36 +928,36 @@ }, "hostname": { "type": "string", - "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.hostname.value]" + "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.hostname.value]" }, "sshCommand": { "type": "string", - "value": "[concat('ssh ', parameters('adminUsername'), '@', reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.hostname.value)]" + "value": "[concat('ssh ', parameters('adminUsername'), '@', reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.hostname.value)]" }, "wlsDomainLocation": { "type": "string", - "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.wlsDomainLocation.value]" + "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.wlsDomainLocation.value]" }, "adminConsoleURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminConsoleURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminConsoleURL.value)]" }, "adminConsoleSecureURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminConsoleSecureURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminConsoleSecureURL.value)]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminRemoteConsoleURL.value)]" }, "adminRemoteConsoleSecureURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecureURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminRemoteConsoleSecureURL.value)]" }, "dnsZoneNameServers": { "type": "array", "condition": "[and(parameters('enableCustomDNS'), not(parameters('hasDNSZones')))]", - "value": "[reference('dnszonesLinkedTemplate','${azure.apiVersionForDeployment}').outputs.dnsZoneNameServers.value]" + "value": "[reference('dnszonesLinkedTemplate','2023-07-01').outputs.dnsZoneNameServers.value]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json index ba47748a4..0740e950e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json @@ -17,7 +17,7 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('vmName')]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json index f88e4117d..eea5faaca 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json @@ -85,7 +85,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsPassword": { @@ -113,9 +113,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${admin.database.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "6b253477-1753-5eb1-9448-506ab47494d7", "properties": { "mode": "Incremental", "template": { @@ -127,11 +127,11 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "properties": { "publisher": "Microsoft.Azure.Extensions", "type": "CustomScript", @@ -152,9 +152,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${admin.database.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "e4549cf7-1f1e-5add-a543-0dfcc627976b", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -170,9 +170,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.oracle}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "692b2d84-72f5-5992-a15d-0d5bcfef040d", "condition": "[if(contains(parameters('databaseType'), 'oracle'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -189,9 +189,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.postgresql}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "935df06e-a5d5-5bf1-af66-4c1eb71dac7a", "condition": "[if(contains(parameters('databaseType'), 'postgresql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -208,9 +208,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.sqlserver}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "3569588c-b89d-5567-84ee-a2c633c7204c", "condition": "[if(contains(parameters('databaseType'), 'sqlserver'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -227,9 +227,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.mysql}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "41c353ae-6f7b-442f-b903-996cb42c1bbe", "condition": "[if(contains(parameters('databaseType'), 'mysql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json index 52164197b..7d1541cbb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json @@ -42,7 +42,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "ttl": { @@ -67,9 +67,9 @@ "resources": [ { "type": "Microsoft.Network/dnszones", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "name": "[parameters('dnszoneName')]", - "tags": "[parameters('tagsByResource')['${identifier.dnszones}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/dnszones']]", "location": "[parameters('location')]", "properties": { "zoneType": "Public" @@ -77,7 +77,7 @@ }, { "type": "Microsoft.Network/dnszones/A", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "condition": "[variables('const_hasARecords')]", "name": "[concat(parameters('dnszoneName'), '/', variables('const_dnszonesARecordSetNames')[copyIndex()])]", "copy": { @@ -96,7 +96,7 @@ }, { "type": "Microsoft.Network/dnszones/CNAME", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "condition": "[variables('const_hasCNAMERecords')]", "name": "[concat(parameters('dnszoneName'),'/', variables('const_dnszonesCNAMERecordSetNames')[copyIndex()])]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json index 766dd3089..dae1db61d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json @@ -15,7 +15,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } } }, @@ -27,16 +27,16 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "${azure.apiVersionForIdentity}", + "apiVersion": "2023-01-31", "name": "[parameters('uamiName')]", "location": "[parameters('location')]", - "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]" + "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_deploymentScriptContributorRoleAssignmentName')]", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "subscriptionId": "[subscription().subscriptionId]", "location": "[parameters('location')]", "properties": { @@ -79,7 +79,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "${azure.apiVersionForRoleAssignment}", + "apiVersion": "2022-04-01", "name": "[variables('name_roleAssignmentName')]", "properties": { "description": "Assign subscription scope role to User Assigned Managed Identity ", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json index 4794a5891..bb2f80929 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json @@ -74,7 +74,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "ttl": { @@ -120,8 +120,8 @@ { "type": "Microsoft.Resources/deployments", "name": "uamiDeployment", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "templateLink": { @@ -146,8 +146,8 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "${azure.apiVersionForDeploymentScript}", - "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", + "apiVersion": "2023-08-01", + "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'uamiDeployment')]" ], @@ -162,7 +162,7 @@ "kind": "AzureCLI", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "AzCliVersion": "${azure.cli.version}", + "AzCliVersion": "2.53.0", "timeout": "PT30M", "environmentVariables": [ { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json index 381354058..d75709ded 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json @@ -53,7 +53,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsDomainName": { @@ -84,10 +84,10 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'), '/newuserscript')]", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "location": "[parameters('location')]", "properties": { "publisher": "Microsoft.Azure.Extensions", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json index b73945dfe..b2a8dc7c7 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json @@ -74,7 +74,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsDomainName": { @@ -99,7 +99,7 @@ }, "variables": { "const_connectionString": "[if(and(equals(parameters('databaseType'),'sqlserver'), equals(last(parameters('dsConnectionURL')),';')), take(parameters('dsConnectionURL'), add(length(parameters('dsConnectionURL')),-1)),parameters('dsConnectionURL'))]", - "const_identityAPIVersion": "${azure.apiVersionForIdentity}", + "const_identityAPIVersion": "2023-01-31", "const_msiDefaultUser": "msiUser", "name_appendIdentityTemplate": "_appendUserManagedIdentity.json", "name_installJdbcLibsTemplate": "_installJdbcLibsTemplate.json", @@ -132,9 +132,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${admin.pswless.database.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "53e099bf-8148-5463-a51d-0272520bac60", "properties": { "mode": "Incremental", "template": { @@ -146,8 +146,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "assignDbIdentityToAdminVM", "properties": { "mode": "Incremental", @@ -163,7 +163,7 @@ "value": "[variables('obj_dbIdentity')]" }, "existingIdentities": { - "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '${azure.apiVersionForVirtualMachines}', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '${azure.apiVersionForVirtualMachines}', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" + "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '2024-11-01', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '2024-11-01', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" }, "location": { "value": "[parameters('location')]" @@ -173,8 +173,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "installJdbcLibsTemplate", "condition": "[or(equals(parameters('databaseType'),'mysql'), equals(parameters('databaseType'),'postgresql'))]", "dependsOn": [ @@ -222,8 +222,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "passwordlessDatasourceDeployment", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'installJdbcLibsTemplate')]" @@ -279,9 +279,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${admin.pswless.database.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "89d5d2a9-16b8-5b3d-b5f7-1fb8a6cfdfc5", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'passwordlessDatasourceDeployment')]" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json index f415721a6..7930418ec 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json @@ -226,7 +226,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } } }, @@ -278,9 +278,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${admin.admin.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "47c1a398-7527-53f0-abc7-13a206844885", "properties": { "mode": "Incremental", "template": { @@ -293,8 +293,8 @@ }, { "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", - "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", + "apiVersion": "2023-06-01", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -344,8 +344,8 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "${azure.apiVersionForStorage}", - "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", + "apiVersion": "2025-01-01", + "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -360,10 +360,10 @@ ] }, { - "apiVersion": "${azure.apiVersionForPrivateEndpoint}", + "apiVersion": "2023-06-01", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -387,7 +387,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -399,7 +399,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -410,9 +410,9 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", "name": "[variables('name_publicIPAddress')]", "location": "[parameters('location')]", "properties": { @@ -423,9 +423,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -450,9 +450,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_nic_with_pub_ip')]", "location": "[parameters('location')]", @@ -481,9 +481,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[variables('name_nic_without_pub_ip')]", "location": "[parameters('location')]", @@ -509,9 +509,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", "name": "[parameters('adminVMName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -554,7 +554,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -566,9 +566,9 @@ }, { "name": "[concat(parameters('adminVMName'),'/newuserscript')]", - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "location": "[parameters('location')]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', parameters('adminVMName'))]", @@ -590,15 +590,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'), '\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'), '\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${admin.admin.end}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "1176aa69-c0c4-5651-8c66-25cbfd8de483", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -614,9 +614,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk21-ol94}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -633,9 +633,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk21-ol810}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -652,9 +652,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk17-ol94}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -671,9 +671,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk17-ol810}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "69b6b433-1679-4d37-af25-3d56987c217a", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -690,9 +690,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol91}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "cd48f178-52a3-415e-88bb-caa45f615b94", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -709,9 +709,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -728,9 +728,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol91}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -747,9 +747,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -766,9 +766,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol91}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -785,9 +785,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -804,9 +804,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -823,9 +823,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -842,9 +842,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json index 695281585..9aba9219d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json @@ -258,7 +258,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "vmSize": { @@ -334,10 +334,10 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${admin.admin.start}", + "apiVersion": "2023-07-01", + "name": "47c1a398-7527-53f0-abc7-13a206844885", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "template": { @@ -349,10 +349,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${admin.ssl.start}", + "apiVersion": "2023-07-01", + "name": "2730ced3-52c2-501c-94b1-bfcffa5b5bc0", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "template": { @@ -364,9 +364,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkSecurityGroups", - "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -416,9 +416,9 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "${azure.apiVersionForStorage}", + "apiVersion": "2025-01-01", "name": "[variables('name_storageAccount')]", - "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", "location": "[parameters('location')]", "sku": { "name": "[variables('const_storageAccountType')]" @@ -432,10 +432,10 @@ ] }, { - "apiVersion": "${azure.apiVersionForPrivateEndpoint}", + "apiVersion": "2023-06-01", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -459,7 +459,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -471,7 +471,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -482,9 +482,9 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", "name": "[variables('name_publicIPAddress')]", "location": "[parameters('location')]", "properties": { @@ -495,9 +495,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -522,9 +522,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_nic_with_pub_ip')]", "location": "[parameters('location')]", @@ -553,9 +553,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[variables('name_nic_without_pub_ip')]", "location": "[parameters('location')]", @@ -581,9 +581,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", "name": "[parameters('adminVMName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -625,7 +625,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -636,9 +636,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", "dependsOn": [ @@ -661,14 +661,14 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'),' ',string(parameters('enableCustomSSL')),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyAlias')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyPassPhrase')),''), '\"')]" } + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'),' ',string(parameters('enableCustomSSL')),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyAlias')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyPassPhrase')),''), '\"')]" } } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${admin.ssl.end}", + "apiVersion": "2023-07-01", + "name": "7185f788-ab74-5158-8f83-4146d01cec9d", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -683,10 +683,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${admin.admin.end}", + "apiVersion": "2023-07-01", + "name": "1176aa69-c0c4-5651-8c66-25cbfd8de483", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -702,9 +702,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk21-ol94}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -721,9 +721,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk21-ol810}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -740,9 +740,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk17-ol94}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -759,9 +759,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk17-ol810}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "69b6b433-1679-4d37-af25-3d56987c217a", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -778,9 +778,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol91}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "cd48f178-52a3-415e-88bb-caa45f615b94", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -797,9 +797,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -816,9 +816,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol91}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -835,9 +835,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -854,9 +854,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol91}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -873,9 +873,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -892,9 +892,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -911,9 +911,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -930,9 +930,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json index 10d56c67c..98ec095ae 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json @@ -88,7 +88,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsDomainName": { @@ -119,8 +119,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "pswlessDbTemplate", "condition": "[parameters('enablePswlessConnection')]", "properties": { @@ -177,8 +177,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "upgradeMySQLJdbcDriverTemplate", "condition": "[and(not(parameters('enablePswlessConnection')), equals(parameters('databaseType'),'mysql'))]", "properties": { @@ -223,9 +223,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "passwordDatasourceDeployment", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[not(parameters('enablePswlessConnection'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'upgradeMySQLJdbcDriverTemplate')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json index a850bc0a0..14e528b71 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json @@ -87,7 +87,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "ttl": { @@ -112,10 +112,10 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.dns.start}", + "apiVersion": "2023-07-01", + "name": "c40d7aa8-9fe7-51c6-86de-27e1b1678735", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "template": { @@ -126,9 +126,9 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "createDNSZone", "condition": "[not(parameters('hasDNSZones'))]", "properties": { @@ -166,9 +166,9 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "updateDNSZone", "condition": "[parameters('hasDNSZones')]", "properties": { @@ -221,10 +221,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.dns.end}", + "apiVersion": "2023-07-01", + "name": "022d99e3-8ba3-5822-b6d5-bcec64518286", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "template": { @@ -239,7 +239,7 @@ "dnsZoneNameServers": { "type": "array", "condition": "[not(parameters('hasDNSZones'))]", - "value": "[reference('createDNSZone', '${azure.apiVersionForDeployment}').outputs.dnsZoneNameServers.value]" + "value": "[reference('createDNSZone', '2023-07-01').outputs.dnsZoneNameServers.value]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json index a2ec4c154..9e10f049d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json @@ -18,7 +18,7 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsAllowed')]", "condition": "[not(parameters('denyPublicTrafficForAdminServer'))]", @@ -37,7 +37,7 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsDenied')]", "condition": "[parameters('denyPublicTrafficForAdminServer')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json index 22eca42b8..e8f98fedb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "const_guidTag" :{ @@ -63,8 +63,8 @@ "resources": [ { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "${azure.apiVersionForDeploymentScript}", - "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", + "apiVersion": "2023-08-01", + "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", "name": "[concat('postdeployscript-', parameters('_globalResourceNameSuffix'))]", "kind": "AzureCLI", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json index c3b66f099..fcbdf9585 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "roleAssignmentNameSeed": { @@ -37,14 +37,14 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "${azure.apiVersionForIdentity}", - "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", + "apiVersion": "2023-01-31", + "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", "name": "[variables('name_postDeploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_postDeploymentScriptRoleAssignment')]", "location": "[parameters('location')]", "subscriptionId": "[subscription().subscriptionId]", @@ -76,7 +76,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "${azure.apiVersionForRoleAssignment}", + "apiVersion": "2022-04-01", "name": "[variables('roleAssignmentGuid')]", "properties": { "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', parameters('innerRoleDefinitionId'))]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json index c3febcf13..ae00e224e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json @@ -286,8 +286,8 @@ ], "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.addnode.coherence.start}", + "apiVersion": "2023-07-01", + "name": "157ea992-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -300,7 +300,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_cacheServerIndexOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -316,13 +316,13 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -354,7 +354,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')))]", "location": "[parameters('location')]", @@ -399,7 +399,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -410,7 +410,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')),'/newuserscript')]", "location": "[parameters('location')]", @@ -437,13 +437,13 @@ ] }, "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')), '${azure.apiVersionForStorage}').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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','True',' ',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_scriptCoherenceFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','True',' ',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'),'\"')]" } } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.addnode.coherence.end}", + "apiVersion": "2023-07-01", + "name": "157ea8ac-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", "dependsOn": [ "virtualMachineExtensionLoop" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json index be5a0898e..9c61123e0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json @@ -339,8 +339,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.addnode.start}", + "apiVersion": "2023-07-01", + "name": "ffa02caf-ecb9-59df-82ce-74b9b0247c50", "properties": { "mode": "Incremental", "template": { @@ -351,7 +351,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -367,13 +367,13 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -405,7 +405,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')))]", "location": "[parameters('location')]", @@ -453,7 +453,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -465,7 +465,7 @@ }, { "type": "Microsoft.Network/applicationGateways", - "apiVersion": "${azure.apiVersionForApplicationGateways}", + "apiVersion": "2023-06-01", "condition": "[parameters('appGatewaySettings').enable]", "name": "[variables('name_appGateway')]", "location": "[parameters('location')]", @@ -657,7 +657,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')), '/newuserscript')]", "location": "[parameters('location')]", @@ -685,13 +685,13 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ', copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').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'),' ',if(parameters('appGatewaySettings').enable, reference(resourceId('Microsoft.Network/publicIPAddresses', parameters('appGatewaySettings').publicIPName),'${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, 'null'), ' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ', parameters('enableCoherence'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-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'),' ',if(parameters('appGatewaySettings').enable, reference(resourceId('Microsoft.Network/publicIPAddresses', parameters('appGatewaySettings').publicIPName),'2023-06-01').dnsSettings.fqdn, 'null'), ' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ', parameters('enableCoherence'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.addnode.end}", + "apiVersion": "2023-07-01", + "name": "2452bb0e-13d9-5ad3-816b-d645ba5198c4", "dependsOn": [ "virtualMachineExtensionLoop" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json index 3b5d25087..4a464b6bf 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json @@ -94,7 +94,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - ${azure.armBased.vmSize.list} + "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" ] }, "osPlatform": "Linux", @@ -1405,21 +1405,21 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "${identifier.applicationGateways}", - "${identifier.virtualMachines}", - "${identifier.virtualMachinesExtensions}", - "${identifier.publicIPAddresses}", - "${identifier.availabilitySets}", - "${identifier.vaults}", - "${identifier.userAssignedIdentities}", - "${identifier.dnszones}", - "${identifier.networkInterfaces}", - "${identifier.networkSecurityGroups}", - "${identifier.privateEndpoints}", - "${identifier.virtualNetworks}", - "${identifier.deploymentScripts}", - "${identifier.storageAccounts}", - "${identifier.resourcesDeployment}" + "Microsoft.Network/applicationGateways", + "Microsoft.Compute/virtualMachines", + "Virtual machine extension", + "Microsoft.Network/publicIPAddresses", + "Microsoft.Compute/availabilitySets", + "Microsoft.KeyVault/vaults", + "Microsoft.ManagedIdentity/userAssignedIdentities", + "Microsoft.Network/dnszones", + "Microsoft.Network/networkInterfaces", + "Microsoft.Network/networkSecurityGroups", + "Microsoft.Network/privateEndpoints", + "Microsoft.Network/virtualNetworks", + "Microsoft.Resources/deploymentScripts", + "Microsoft.Storage/storageAccounts", + "Microsoft resources deployment" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json index 32cf58e1b..788f61ddc 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json @@ -321,7 +321,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "usePreviewImage": { @@ -536,21 +536,21 @@ // If adding a new resource, add the resource identifier to the array below // Also modify createUIDefinition.json to include the new resource "obj_tagsByResources": { - "${identifier.applicationGateways}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.applicationGateways}')]", - "${identifier.availabilitySets}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.availabilitySets}')]", - "${identifier.dnszones}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.dnszones}')]", - "${identifier.networkInterfaces}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkInterfaces}')]", - "${identifier.networkSecurityGroups}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkSecurityGroups}')]", - "${identifier.publicIPAddresses}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.publicIPAddresses}')]", - "${identifier.privateEndpoints}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.privateEndpoints}')]", - "${identifier.storageAccounts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.storageAccounts}')]", - "${identifier.vaults}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.vaults}')]", - "${identifier.virtualNetworks}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualNetworks}')]", - "${identifier.virtualMachines}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]", - "${identifier.virtualMachinesExtensions}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachinesExtensions}')]", - "${identifier.deploymentScripts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.deploymentScripts}')]", - "${identifier.userAssignedIdentities}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.userAssignedIdentities}')]", - "${identifier.resourcesDeployment}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.resourcesDeployment}')]" + "Microsoft.Network/applicationGateways": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/applicationGateways')]", + "Microsoft.Compute/availabilitySets": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/availabilitySets')]", + "Microsoft.Network/dnszones": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/dnszones')]", + "Microsoft.Network/networkInterfaces": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces')]", + "Microsoft.Network/networkSecurityGroups": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkSecurityGroups')]", + "Microsoft.Network/publicIPAddresses": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses')]", + "Microsoft.Network/privateEndpoints": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/privateEndpoints')]", + "Microsoft.Storage/storageAccounts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts')]", + "Microsoft.KeyVault/vaults": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.KeyVault/vaults')]", + "Microsoft.Network/virtualNetworks": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks')]", + "Microsoft.Compute/virtualMachines": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/virtualMachines')]", + "Virtual machine extension": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Virtual machine extension')]", + "Microsoft.Resources/deploymentScripts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Resources/deploymentScripts')]", + "Microsoft.ManagedIdentity/userAssignedIdentities": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.ManagedIdentity/userAssignedIdentities')]", + "Microsoft resources deployment": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft resources deployment')]" } }, "functions": [ @@ -580,10 +580,10 @@ ], "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.start}", + "apiVersion": "2023-07-01", + "name": "pid-7363cd91-937d-4469-a7a8-ecbeddfb7a0f-partnercenter", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "template": { @@ -595,9 +595,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_clusterTemplate')]", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "condition": "[not(parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -719,8 +719,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "name": "[variables('name_clusterCustomSSLTemplate')]", "condition": "[parameters('enableCustomSSL')]", "properties": { @@ -870,8 +870,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "name": "keyVaultwithSelfSignedAppGatewaySSLCert", "condition": "[and(parameters('enableAppGateway'), equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')))]", "dependsOn": [ @@ -910,8 +910,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "networkSecurityLinkedTemplate", "properties": { @@ -941,8 +941,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "name": "appGatewayLinkedTemplate", "condition": "[parameters('enableAppGateway')]", "properties": { @@ -971,10 +971,10 @@ "value": "[parameters('appGatewaySSLBackendCertData')]" }, "autoGeneratedSSLCertKeyVaultName": { - "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '${azure.apiVersionForDeployment}').outputs.keyvaultName.value, '')]" + "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '2023-07-01').outputs.keyvaultName.value, '')]" }, "autoGeneratedSSLCertSecretName": { - "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '${azure.apiVersionForDeployment}').outputs.secretName.value, '')]" + "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '2023-07-01').outputs.secretName.value, '')]" }, "customDomainNameforApplicationGateway": { "value": "[format('{0}.{1}', parameters('dnszoneAppGatewayLabel'), parameters('dnszoneName'))]" @@ -1042,8 +1042,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "name": "dnszonesLinkedTemplate", "condition": "[parameters('enableDNSConfiguration')]", "dependsOn": [ @@ -1071,7 +1071,7 @@ ] }, "dnszonesCNAMEAlias": { - "value": "[if(parameters('enableAppGateway'), createArray(reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayAlias.value), createArray())]" + "value": "[if(parameters('enableAppGateway'), createArray(reference('appGatewayLinkedTemplate', '2023-07-01').outputs.appGatewayAlias.value), createArray())]" }, "dnszonesCNAMERecordSetNames": { "value": "[if(parameters('enableAppGateway'), createArray(parameters('dnszoneAppGatewayLabel')), createArray())]" @@ -1090,7 +1090,7 @@ }, "targetResources": { "value": [ - "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value]" + "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs._adminPublicIPId.value]" ] }, "tagsByResource": { @@ -1101,8 +1101,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "name": "dbLinkedTemplate", "condition": "[parameters('enableDB')]", "dependsOn": [ @@ -1178,11 +1178,11 @@ { "name": "coherenceTemplate", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "condition": "[and(parameters('enableCoherence'),not(parameters('enableCustomSSL')))]", "properties": { "mode": "Incremental", @@ -1237,7 +1237,7 @@ "value": "[parameters('skuUrnVersion')]" }, "storageAccountName": { - "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" + "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.storageAccountName.value]" }, "subnetName": { "value": "[parameters('subnetName')]" @@ -1281,11 +1281,11 @@ { "name": "coherenceTemplateWithCustomSSL", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "condition": "[and(parameters('enableCoherence'),parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -1340,7 +1340,7 @@ "value": "[parameters('skuUrnVersion')]" }, "storageAccountName": { - "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" + "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.storageAccountName.value]" }, "subnetName": { "value": "[parameters('subnetName')]" @@ -1407,10 +1407,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_uamiForPostDeploymentScript')]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('clusterTemplateRef'))]", "[resourceId('Microsoft.Resources/deployments', 'keyVaultwithSelfSignedAppGatewaySSLCert')]", @@ -1441,10 +1441,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "postDeplyment", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('clusterTemplateRef'))]", "[resourceId('Microsoft.Resources/deployments', 'keyVaultwithSelfSignedAppGatewaySSLCert')]", @@ -1482,16 +1482,16 @@ "value": "[parameters('_artifactsLocationSasToken')]" }, "userAssignedIdentityResourceId":{ - "value": "[reference(variables('name_uamiForPostDeploymentScript'),'${azure.apiVersionForDeployment}').outputs.uamidForPostDeployment.value]" + "value": "[reference(variables('name_uamiForPostDeploymentScript'),'2023-07-01').outputs.uamidForPostDeployment.value]" } } } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.end}", + "apiVersion": "2023-07-01", + "name": "0fa14086-2d46-54a4-8aba-470addc3dce6", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('clusterTemplateRef'))]", "[resourceId('Microsoft.Resources/deployments', 'keyVaultwithSelfSignedAppGatewaySSLCert')]", @@ -1522,35 +1522,35 @@ }, "wlsDomainLocation": { "type": "string", - "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.wlsDomainLocation.value]" + "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.wlsDomainLocation.value]" }, "adminHostName": { "type": "string", - "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminHostName.value]" + "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminHostName.value]" }, "adminConsole": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminConsole.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminConsole.value)]" }, "adminSecuredConsole": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminSecuredConsole.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminSecuredConsole.value)]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminRemoteConsoleURL.value)]" }, "adminRemoteConsoleSecuredURL": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecuredURL.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminRemoteConsoleSecuredURL.value)]" }, "appGatewayURL": { "type": "string", - "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('http://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value),'')]" + "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('http://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '2023-07-01').outputs.appGatewayURL.value),'')]" }, "appGatewaySecuredURL": { "type": "string", - "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('https://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewaySecuredURL.value),'')]" + "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('https://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '2023-07-01').outputs.appGatewaySecuredURL.value),'')]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json index 8b4415932..c56356854 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json @@ -137,7 +137,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "virtualNetworkNewOrExisting": { @@ -201,9 +201,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.appgateway.custom.certificate}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "d7c730b9-494c-5cc2-9695-cc1057da3e0b", "condition": "[not(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')))]", "properties": { "mode": "Incremental", @@ -217,8 +217,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "appGatewaywithExistingSSLCertTemplate", "condition": "[equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionHaveCert'))]", "properties": { @@ -305,8 +305,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "appGatewaywithSelfSignedSSLCertTemplate", "condition": "[equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert'))]", "properties": { @@ -401,16 +401,16 @@ "appGatewayAlias": { "type": "string", "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')), - reference('appGatewaywithExistingSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayAlias.value, - reference('appGatewaywithSelfSignedSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayAlias.value)]" + reference('appGatewaywithExistingSSLCertTemplate', '2023-07-01').outputs.appGatewayAlias.value, + reference('appGatewaywithSelfSignedSSLCertTemplate', '2023-07-01').outputs.appGatewayAlias.value)]" }, "appGatewayURL": { "type": "string", - "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value)]" + "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '2023-07-01').outputs.appGatewayURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '2023-07-01').outputs.appGatewayURL.value)]" }, "appGatewaySecuredURL": { "type": "string", - "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewaySecuredURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewaySecuredURL.value)]" + "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '2023-07-01').outputs.appGatewaySecuredURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '2023-07-01').outputs.appGatewaySecuredURL.value)]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json index ba47748a4..0740e950e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json @@ -17,7 +17,7 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('vmName')]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json index 4daf450f0..6c9299c8d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json @@ -88,7 +88,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsUserName": { @@ -117,9 +117,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.database.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "9e8f86ad-dcf5-5acd-a1f5-26d62358f218", "properties": { "mode": "Incremental", "template": { @@ -131,9 +131,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", "properties": { @@ -156,9 +156,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.database.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "a1760bef-276e-53eb-bea2-e150d7638b49", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -174,9 +174,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.oracle}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "692b2d84-72f5-5992-a15d-0d5bcfef040d", "condition": "[if(contains(parameters('databaseType'), 'oracle'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -193,9 +193,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.postgresql}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "935df06e-a5d5-5bf1-af66-4c1eb71dac7a", "condition": "[if(contains(parameters('databaseType'), 'postgresql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -212,9 +212,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.mysql}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "41c353ae-6f7b-442f-b903-996cb42c1bbe", "condition": "[if(contains(parameters('databaseType'), 'mysql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -231,9 +231,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${database.sqlserver}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "3569588c-b89d-5567-84ee-a2c633c7204c", "condition": "[if(contains(parameters('databaseType'), 'sqlserver'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json index 2dfcf0629..a82179852 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json @@ -42,7 +42,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "ttl": { @@ -67,8 +67,8 @@ "resources": [ { "type": "Microsoft.Network/dnszones", - "apiVersion": "${azure.apiVersionForDNSZone}", - "tags": "[parameters('tagsByResource')['${identifier.dnszones}']]", + "apiVersion": "2023-07-01-preview", + "tags": "[parameters('tagsByResource')['Microsoft.Network/dnszones']]", "name": "[parameters('dnszoneName')]", "location": "[parameters('location')]", "properties": { @@ -77,7 +77,7 @@ }, { "type": "Microsoft.Network/dnszones/A", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "condition": "[variables('const_hasARecords')]", "name": "[concat(parameters('dnszoneName'), '/', variables('const_dnszonesARecordSetNames')[copyIndex()])]", "copy": { @@ -96,7 +96,7 @@ }, { "type": "Microsoft.Network/dnszones/CNAME", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "condition": "[variables('const_hasCNAMERecords')]", "name": "[concat(parameters('dnszoneName'),'/', variables('const_dnszonesCNAMERecordSetNames')[copyIndex()])]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json index 0e2b79f4d..4b29eef0f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json @@ -12,7 +12,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } } }, @@ -24,15 +24,15 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "${azure.apiVersionForIdentity}", - "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", + "apiVersion": "2023-01-31", + "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", "name": "[parameters('uamiName')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "[variables('name_deploymentScriptContributorRoleAssignmentName')]", "subscriptionId": "[subscription().subscriptionId]", "location": "[parameters('location')]", @@ -69,7 +69,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "${azure.apiVersionForRoleAssignment}", + "apiVersion": "2022-04-01", "name": "[variables('name_roleAssignmentName')]", "properties": { "description": "Assign subscription scope role to User Assigned Managed Identity ", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json index c77d29f55..34b948ea7 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json @@ -74,7 +74,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "ttl": { @@ -120,8 +120,8 @@ { "type": "Microsoft.Resources/deployments", "name": "uamiDeployment", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "2023-07-01", "properties": { "mode": "Incremental", "templateLink": { @@ -143,8 +143,8 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "${azure.apiVersionForDeploymentScript}", - "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", + "apiVersion": "2023-08-01", + "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'uamiDeployment')]" ], @@ -159,7 +159,7 @@ "kind": "AzureCLI", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "AzCliVersion": "${azure.cli.version}", + "AzCliVersion": "2.53.0", "timeout": "PT30M", "environmentVariables": [ { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json index b6d2087d7..462213ba0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json @@ -75,7 +75,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsDomainName": { @@ -107,9 +107,9 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "name": "[concat(variables('const_managedVMPrefix'), copyIndex(1),'/newuserscript')]", "location": "[parameters('location')]", "copy": { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json index 87c767643..0139be3f1 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json @@ -59,7 +59,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "utcValue": { @@ -75,14 +75,14 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "${azure.apiVersionForIdentity}", - "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", + "apiVersion": "2023-01-31", + "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", "name": "[variables('name_deploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "${azure.apiVersionForRoleAssignment}", + "apiVersion": "2022-04-01", "name": "[variables('name_roleAssignmentName')]", "dependsOn": [ "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('name_deploymentScriptUserDefinedManagedIdentity'))]" @@ -96,8 +96,8 @@ }, { "type": "Microsoft.KeyVault/vaults", - "apiVersion": "${azure.apiVersionForKeyVault}", - "tags": "[parameters('tagsByResource')['${identifier.vaults}']]", + "apiVersion": "2024-11-01", + "tags": "[parameters('tagsByResource')['Microsoft.KeyVault/vaults']]", "name": "[parameters('keyvaultName')]", "dependsOn": [ "[resourceId('Microsoft.Authorization/roleAssignments', variables('name_roleAssignmentName'))]" @@ -125,8 +125,8 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "${azure.apiVersionForDeploymentScript}", - "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", + "apiVersion": "2023-08-01", + "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", "name": "[concat('script-generate-certificate-', parameters('_globalResourceNameSuffix'))]", "location": "[parameters('location')]", "dependsOn": [ @@ -141,7 +141,7 @@ "kind": "AzurePowerShell", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "azPowerShellVersion": "${azure.powershell.version}", + "azPowerShellVersion": "11.5", "timeout": "PT30M", "arguments": "[format(' -vaultName {0} -certificateName {1} -subjectName {2}', parameters('keyvaultName'), parameters('secretName'), parameters('subjectName'))]", "environmentVariables": [ diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json index 7eb7112ad..773f2e3b0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json @@ -96,7 +96,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsDomainName": { @@ -121,7 +121,7 @@ }, "variables": { "const_connectionString": "[if(and(equals(parameters('databaseType'),'sqlserver'), equals(last(parameters('dsConnectionURL')),';')), take(parameters('dsConnectionURL'), add(length(parameters('dsConnectionURL')),-1)),parameters('dsConnectionURL'))]", - "const_identityAPIVersion": "${azure.apiVersionForIdentity}", + "const_identityAPIVersion": "2023-01-31", "const_managedVMPrefix": "[concat(parameters('managedVMNamePrefix'), 'VM')]", "const_msiDefaultUser": "msiUser", "name_appendIdentityTemplate": "_appendUserManagedIdentity.json", @@ -155,9 +155,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.pswless.database.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "340f5265-6de7-5b6f-aad3-9f179736cde0", "properties": { "mode": "Incremental", "template": { @@ -169,8 +169,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "[concat('assignDbIdentityTo',variables('const_managedVMPrefix'), copyIndex(1))]", "copy": { "name": "virtualMachineIdentityLoop", @@ -190,7 +190,7 @@ "value": "[variables('obj_dbIdentity')]" }, "existingIdentities": { - "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" + "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" }, "location": { "value": "[parameters('location')]" @@ -200,8 +200,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "installJdbcLibsTemplate", "condition": "[or(equals(parameters('databaseType'),'mysql'), equals(parameters('databaseType'),'postgresql'))]", "dependsOn": [ @@ -258,8 +258,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "passwordlessDatasourceDeployment", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'installJdbcLibsTemplate')]" @@ -315,9 +315,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.pswless.database.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "b4d91140-fb26-50de-9358-147b9dd25f7a", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'passwordlessDatasourceDeployment')]" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json index 74a24fc17..344f8de1a 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json @@ -112,7 +112,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "virtualNetworkNewOrExisting": { @@ -238,9 +238,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.appgateway.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "4f85ce49-6de4-5925-b77c-3eb15ba97921", "properties": { "mode": "Incremental", "template": { @@ -252,9 +252,9 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[parameters('tagsByResource')['${identifier.publicIPAddresses}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']]", "name": "[parameters('gatewayPublicIPAddressName')]", "sku": { "name": "Standard" @@ -269,8 +269,8 @@ }, { "type": "Microsoft.Network/applicationGateways", - "apiVersion": "${azure.apiVersionForApplicationGateways}", - "tags": "[parameters('tagsByResource')['${identifier.applicationGateways}']]", + "apiVersion": "2023-06-01", + "tags": "[parameters('tagsByResource')['Microsoft.Network/applicationGateways']]", "name": "[parameters('appGatewayName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -338,7 +338,7 @@ "name": "BackendAddresses", "count": "[sub(int(parameters('numberOfInstances')),1)]", "input": { - "ipAddress": "[reference(resourceId('Microsoft.Network/networkInterfaces', concat(variables('name_managedVMNamePrefix'), copyIndex('BackendAddresses',1), if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), variables('name_nic_with_pub_ip'), variables('name_nic_without_pub_ip')))),'${azure.apiVersionForNetworkInterfaces}').ipConfigurations[0].properties.privateIPAddress]" + "ipAddress": "[reference(resourceId('Microsoft.Network/networkInterfaces', concat(variables('name_managedVMNamePrefix'), copyIndex('BackendAddresses',1), if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), variables('name_nic_with_pub_ip'), variables('name_nic_without_pub_ip')))),'2023-06-01').ipConfigurations[0].properties.privateIPAddress]" } } ] @@ -458,9 +458,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", "dependsOn": [ @@ -477,15 +477,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAGWConfiguration'),' <<< \"', variables('const_adminServerName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ', if(parameters('overrideHostName'), parameters('customDomainName'), reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), ' ',variables('const_wlsHome'),'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAGWConfiguration'),' <<< \"', variables('const_adminServerName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ', if(parameters('overrideHostName'), parameters('customDomainName'), reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn), ' ',variables('const_wlsHome'),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.appgateway.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "b626bee4-b322-5418-990f-6463a799be3c", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -503,15 +503,15 @@ "outputs": { "appGatewayAlias": { "type": "string", - "value": "[reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn]" + "value": "[reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn]" }, "appGatewayURL": { "type": "string", - "value": "[uri(format('http://{0}',reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn),'')]" + "value": "[uri(format('http://{0}',reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn),'')]" }, "appGatewaySecuredURL": { "type": "string", - "value": "[uri(format('https://{0}',reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn),'')]" + "value": "[uri(format('https://{0}',reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn),'')]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json index 3774a0767..bec6c9b15 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json @@ -145,7 +145,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "usePreviewImage": { @@ -423,9 +423,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.cluster.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "07bfd1f7-83ff-50cd-bd74-61b00a2a6808", "properties": { "mode": "Incremental", "template": { @@ -438,9 +438,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.ssl.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "e09585b6-b7cb-5437-a600-c95c88ac37b3", "properties": { "mode": "Incremental", "template": { @@ -452,9 +452,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkSecurityGroups", - "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -519,8 +519,8 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "${azure.apiVersionForStorage}", - "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", + "apiVersion": "2025-01-01", + "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -535,10 +535,10 @@ ] }, { - "apiVersion": "${azure.apiVersionForPrivateEndpoint}", + "apiVersion": "2023-06-01", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -563,7 +563,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -575,7 +575,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -586,9 +586,9 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", "location": "[parameters('location')]", "copy": { @@ -606,9 +606,9 @@ ] }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -624,9 +624,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", "location": "[parameters('location')]", "copy": { @@ -659,8 +659,8 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "apiVersion": "2023-06-01", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -679,7 +679,7 @@ "properties": { "privateIPAllocationMethod": "Dynamic", "publicIPAddress": { - "id": "[resourceId('${identifier.publicIPAddresses}',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" + "id": "[resourceId('Microsoft.Network/publicIPAddresses',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" }, "subnet": { "id": "[variables('ref_subnet')]" @@ -691,8 +691,8 @@ }, { "type": "Microsoft.Compute/availabilitySets", - "apiVersion": "${azure.apiVersionForAvailabilitySets}", - "tags": "[parameters('tagsByResource')['${identifier.availabilitySets}']]", + "apiVersion": "2024-11-01", + "tags": "[parameters('tagsByResource')['Microsoft.Compute/availabilitySets']]", "location": "[parameters('location')]", "name": "[variables('name_availabilitySet')]", "properties": { @@ -707,9 +707,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", "copy": { @@ -760,7 +760,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -771,9 +771,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'), copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", "copy": { @@ -799,15 +799,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.ssl.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "4f29ea52-dfd6-5537-8a38-4ad9fec1b2eb", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -823,9 +823,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.cluster.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "f05658d8-329d-55e8-9077-5761b8279b31", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -841,9 +841,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk21-ol94}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -861,9 +861,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk21-ol810}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -881,9 +881,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk17-ol94}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -901,9 +901,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk17-ol810}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "69b6b433-1679-4d37-af25-3d56987c217a", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -921,9 +921,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk11-ol91}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "cd48f178-52a3-415e-88bb-caa45f615b94", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -941,9 +941,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk11-ol87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -961,9 +961,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk8-ol91}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -981,9 +981,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk8-ol87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -1001,9 +1001,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-122140-jdk8-ol91}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -1021,9 +1021,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-122140-jdk8-ol87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -1041,9 +1041,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk11-rhel87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1060,9 +1060,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1079,9 +1079,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-122140-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1108,23 +1108,23 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" }, "adminRemoteConsoleSecuredURL": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" }, "wlsDomainLocation": { "type": "string", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json index a4d6f0ea8..9facba151 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json @@ -139,7 +139,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "usePreviewImage": { @@ -367,9 +367,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.cluster.start}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "07bfd1f7-83ff-50cd-bd74-61b00a2a6808", "properties": { "mode": "Incremental", "template": { @@ -381,9 +381,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkSecurityGroups", - "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -448,9 +448,9 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "${azure.apiVersionForStorage}", + "apiVersion": "2025-01-01", "name": "[variables('name_storageAccount')]", - "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", "location": "[parameters('location')]", "sku": { "name": "[variables('const_storageAccountType')]" @@ -464,10 +464,10 @@ ] }, { - "apiVersion": "${azure.apiVersionForPrivateEndpoint}", + "apiVersion": "2023-06-01", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -492,7 +492,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -504,7 +504,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -515,9 +515,9 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", "location": "[parameters('location')]", "copy": { @@ -535,9 +535,9 @@ ] }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -552,9 +552,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", "location": "[parameters('location')]", "copy": { @@ -587,8 +587,8 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "apiVersion": "2023-06-01", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -607,7 +607,7 @@ "properties": { "privateIPAllocationMethod": "Dynamic", "publicIPAddress": { - "id": "[resourceId('${identifier.publicIPAddresses}',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" + "id": "[resourceId('Microsoft.Network/publicIPAddresses',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" }, "subnet": { "id": "[variables('ref_subnet')]" @@ -619,8 +619,8 @@ }, { "type": "Microsoft.Compute/availabilitySets", - "apiVersion": "${azure.apiVersionForAvailabilitySets}", - "tags": "[parameters('tagsByResource')['${identifier.availabilitySets}']]", + "apiVersion": "2024-11-01", + "tags": "[parameters('tagsByResource')['Microsoft.Compute/availabilitySets']]", "location": "[parameters('location')]", "name": "[variables('name_availabilitySet')]", "properties": { @@ -635,9 +635,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", "copy": { @@ -688,7 +688,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -699,9 +699,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'), copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", "copy": { @@ -727,15 +727,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false',' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'), ' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false',' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'), ' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${cluster.cluster.end}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "f05658d8-329d-55e8-9077-5761b8279b31", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -751,9 +751,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk21-ol94}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -771,9 +771,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk21-ol810}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -791,9 +791,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk17-ol94}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -811,9 +811,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141200-jdk17-ol810}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "69b6b433-1679-4d37-af25-3d56987c217a", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -831,9 +831,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk11-ol91}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "cd48f178-52a3-415e-88bb-caa45f615b94", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -851,9 +851,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk11-ol87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -871,9 +871,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk8-ol91}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -891,9 +891,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk8-ol87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -911,9 +911,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-122140-jdk8-ol91}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -931,9 +931,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-122140-jdk8-ol87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -951,9 +951,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk11-rhel87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -970,9 +970,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-141100-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -989,9 +989,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "name": "${from.owls-122140-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1018,23 +1018,23 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" }, "adminRemoteConsoleSecuredURL": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" }, "wlsDomainLocation": { "type": "string", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json index e013979b0..b09600f06 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json @@ -147,7 +147,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "usePreviewImage": { @@ -333,10 +333,10 @@ ], "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.coherence.start}", + "apiVersion": "2023-07-01", + "name": "157eab40-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "template": { @@ -348,9 +348,9 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[parameters('tagsByResource')['${identifier.publicIPAddresses}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']]", "name": "[concat(variables('name_vmPrefix'),copyIndex(1),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", "copy": { @@ -365,15 +365,15 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", "name": "[concat(variables('name_vmPrefix'), copyIndex(1), variables('name_nic'))]", "location": "[parameters('location')]", "copy": { @@ -404,9 +404,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", + "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", "name": "[concat(variables('name_vmPrefix'), copyIndex(1))]", "location": "[parameters('location')]", "copy": { @@ -450,7 +450,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -462,9 +462,9 @@ }, { "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", + "tags": "[parameters('tagsByResource')['Virtual machine extension']]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('name_vmPrefix'), copyIndex(),'/newuserscript'))]", - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "location": "[parameters('location')]", "copy": { "name": "virtualMachineExtensionLoop", @@ -488,15 +488,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfCoherenceCacheInstances'),' ',variables('name_vmPrefix'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','False',' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfCoherenceCacheInstances'),' ',variables('name_vmPrefix'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','False',' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.coherence.end}", + "apiVersion": "2023-07-01", + "name": "157eaa6e-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "dependsOn": [ "virtualMachineExtensionLoop" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json index f5beb33c8..bd5d7b26d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json @@ -110,7 +110,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "wlsDomainName": { @@ -141,8 +141,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "pswlessDbTemplate", "condition": "[parameters('enablePswlessConnection')]", "properties": { @@ -208,9 +208,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "upgradeMySQLJdbcDriverTemplate", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[and(not(parameters('enablePswlessConnection')), equals(parameters('databaseType'),'mysql'))]", "properties": { "mode": "Incremental", @@ -263,9 +263,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "passwordDatasourceDeployment", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "condition": "[not(parameters('enablePswlessConnection'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'upgradeMySQLJdbcDriverTemplate')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json index 9ee842405..17255efbb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json @@ -87,7 +87,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "ttl": { @@ -112,9 +112,9 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.dns.start}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "2023-07-01", + "name": "c40d7aa8-9fe7-51c6-86de-27e1b1678735", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -126,9 +126,9 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "createDNSZone", "condition": "[not(parameters('hasDNSZones'))]", "properties": { @@ -166,9 +166,9 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "name": "updateDNSZone", "condition": "[parameters('hasDNSZones')]", "properties": { @@ -221,10 +221,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.dns.end}", + "apiVersion": "2023-07-01", + "name": "022d99e3-8ba3-5822-b6d5-bcec64518286", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", "properties": { "mode": "Incremental", "template": { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json index 462b9487d..2d84c8d31 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json @@ -29,7 +29,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsAllowed')]", "condition": "[not(parameters('denyPublicTrafficForAdminServer'))]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "TCP", "sourcePortRange": "*", @@ -48,7 +48,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsDenied')]", "condition": "[parameters('denyPublicTrafficForAdminServer')]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -67,7 +67,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsAllowed')]", "condition": "[and(not(parameters('denyPublicTrafficForManagedServer')), parameters('enableAppGateway'))]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -85,7 +85,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsDenied')]", "condition": "[and(parameters('denyPublicTrafficForManagedServer'), parameters('enableAppGateway'))]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "*", "sourcePortRange": "*", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json index 98adee5f9..e8f98fedb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "const_guidTag" :{ @@ -62,9 +62,9 @@ }, "resources": [ { - "type": "${identifier.deploymentScripts}", - "apiVersion": "${azure.apiVersionForDeploymentScript}", - "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", + "type": "Microsoft.Resources/deploymentScripts", + "apiVersion": "2023-08-01", + "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", "name": "[concat('postdeployscript-', parameters('_globalResourceNameSuffix'))]", "kind": "AzureCLI", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json index 2f0cb1387..4afabcc7d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "roleAssignmentNameSeed": { @@ -36,20 +36,20 @@ }, "resources": [ { - "type": "${identifier.userAssignedIdentities}", - "apiVersion": "${azure.apiVersionForIdentity}", - "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", + "type": "Microsoft.ManagedIdentity/userAssignedIdentities", + "apiVersion": "2023-01-31", + "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", "name": "[variables('name_postDeploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_postDeploymentScriptRoleAssignment')]", "location": "[parameters('location')]", "subscriptionId": "[subscription().subscriptionId]", "dependsOn": [ - "[resourceId('${identifier.userAssignedIdentities}', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" + "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" ], "properties": { "mode": "Incremental", @@ -76,7 +76,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "${azure.apiVersionForRoleAssignment}", + "apiVersion": "2022-04-01", "name": "[variables('roleAssignmentGuid')]", "properties": { "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', parameters('innerRoleDefinitionId'))]", @@ -88,7 +88,7 @@ }, "parameters": { "innerPrincipalId": { - "value": "[reference(resourceId('${identifier.userAssignedIdentities}',variables('name_postDeploymentScriptUserDefinedManagedIdentity'))).principalId]" + "value": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities',variables('name_postDeploymentScriptUserDefinedManagedIdentity'))).principalId]" }, "innerRoleDefinitionId": { "value": "[variables('const_roleDefinitionIdOfContributor')]" @@ -103,7 +103,7 @@ "outputs": { "uamidForPostDeployment": { "type": "string", - "value": "[resourceId('${identifier.userAssignedIdentities}', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" + "value": "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json index bab15a8b0..12a322e90 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json @@ -93,8 +93,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.deletenode.start}", + "apiVersion": "2023-07-01", + "name": "7d4ae6d6-17c5-5168-b7d2-e0bf33a1e878", "properties": { "mode": "Incremental", "template": { @@ -106,7 +106,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -127,8 +127,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.deletenode.end}", + "apiVersion": "2023-07-01", + "name": "4b263220-3cc6-53b9-aef3-23ad10c45d52", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], 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 f24a984a6..0016bd373 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 @@ -286,8 +286,8 @@ ], "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.addnode.coherence.start}", + "apiVersion": "2023-07-01", + "name": "157ea410-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -300,7 +300,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_cacheServerIndexOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -316,13 +316,13 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -354,7 +354,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')))]", "location": "[parameters('location')]", @@ -399,7 +399,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -410,7 +410,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')),'/newuserscript')]", "location": "[parameters('location')]", @@ -437,13 +437,13 @@ ] }, "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')), '${azure.apiVersionForStorage}').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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,base64(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_scriptCoherenceFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,base64(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'),'\"')]" } } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.addnode.coherence.end}", + "apiVersion": "2023-07-01", + "name": "157ea1ea-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", "dependsOn": [ "virtualMachineExtensionLoop" 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 94a0f995b..697ff0357 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 @@ -311,8 +311,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.addnode.start}", + "apiVersion": "2023-07-01", + "name": "5f68f633-701b-58b0-83c2-399c6d1d8414", "properties": { "mode": "Incremental", "template": { @@ -323,7 +323,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -339,13 +339,13 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -377,7 +377,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')))]", "location": "[parameters('location')]", @@ -422,7 +422,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -433,7 +433,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')), '/newuserscript')]", "location": "[parameters('location')]", @@ -460,14 +460,14 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('dynamicClusterSize'),' ', variables('const_managedVMPrefix'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').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'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('dynamicClusterSize'),' ', variables('const_managedVMPrefix'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-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'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.addnode.end}", + "apiVersion": "2023-07-01", + "name": "449e677a-5fc3-55cb-9193-4b225f42e646", "dependsOn": [ "virtualMachineExtensionLoop" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json index 27137136f..4c06ddf76 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json @@ -90,7 +90,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - ${azure.armBased.vmSize.list} + "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" ] }, "osPlatform": "Linux", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json index 86c52e4e9..314a2e33e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json @@ -550,8 +550,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.start}", + "apiVersion": "2023-07-01", + "name": "pid-89d7f595-f164-4cbd-abbb-e46cd0b342e8-partnercenter", "properties": { "mode": "Incremental", "template": { @@ -563,7 +563,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_clusterTemplate')]", "condition": "[not(parameters('enableCustomSSL'))]", "properties": { @@ -674,7 +674,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_clusterCustomSSLTemplate')]", "condition": "[parameters('enableCustomSSL')]", "properties": { @@ -812,7 +812,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "networkSecurityLinkedTemplate", "properties": { @@ -843,7 +843,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "dbLinkedTemplate", "condition": "[parameters('enableDB')]", "dependsOn": [ @@ -919,7 +919,7 @@ "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "condition": "[and(parameters('enableCoherence'),not(parameters('enableCustomSSL')))]", "properties": { "mode": "Incremental", @@ -974,7 +974,7 @@ "value": "[parameters('subnetName')]" }, "storageAccountName": { - "value": "[reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" + "value": "[reference(variables('ref_clusterTemplate'), '2023-07-01').outputs.storageAccountName.value]" }, "usePreviewImage": { "value": "[parameters('usePreviewImage')]" @@ -1015,7 +1015,7 @@ "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "condition": "[and(parameters('enableCoherence'),parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -1067,7 +1067,7 @@ "value": "[parameters('skuUrnVersion')]" }, "storageAccountName": { - "value": "[reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" + "value": "[reference(variables('ref_clusterTemplate'), '2023-07-01').outputs.storageAccountName.value]" }, "usePreviewImage": { "value": "[parameters('usePreviewImage')]" @@ -1137,7 +1137,7 @@ "[resourceId('Microsoft.Resources/deployments', 'coherenceTemplate')]", "[resourceId('Microsoft.Resources/deployments', 'coherenceTemplateWithCustomSSL')]" ], - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "condition": "[parameters('enableOHS')]", "properties": { "mode": "Incremental", @@ -1165,7 +1165,7 @@ "value": "[parameters('dnsLabelPrefix')]" }, "storageAccountName": { - "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" + "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.storageAccountName.value]" }, "subnetName": { "value": "[parameters('subnetName')]" @@ -1216,13 +1216,13 @@ "value": "[parameters('virtualNetworkResourceGroupName')]" }, "virtualNetworkName": { - "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.virtualNetworkName.value]" + "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.virtualNetworkName.value]" }, "vmSize": { "value": "[parameters('vmSize')]" }, "adminRestMgmtURL": { - "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminRestMgmtURL.value]" + "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminRestMgmtURL.value]" }, "wlsPassword": { "value": "[parameters('wlsPassword')]" @@ -1238,7 +1238,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "dnszonesLinkedTemplate", "condition": "[parameters('enableCustomDNS')]", "dependsOn": [ @@ -1276,14 +1276,14 @@ "value": "[parameters('dnszoneResourceGroup')]" }, "targetResources": { - "value": "[if(parameters('enableOHS'), createArray(reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value, reference('ohsLinkedTemplate', '${azure.apiVersionForDeployment}').outputs._ohsPublicIP.value), createArray(reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value))]" + "value": "[if(parameters('enableOHS'), createArray(reference(variables('ref_clusterTemplate'), '2023-07-01').outputs._adminPublicIPId.value, reference('ohsLinkedTemplate', '2023-07-01').outputs._ohsPublicIP.value), createArray(reference(variables('ref_clusterTemplate'), '2023-07-01').outputs._adminPublicIPId.value))]" } } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_uamiForPostDeploymentScript')]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "dependsOn": [ @@ -1313,7 +1313,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "postDeplyment", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "dependsOn": [ @@ -1349,15 +1349,15 @@ "value": "[parameters('_artifactsLocationSasToken')]" }, "userAssignedIdentityResourceId":{ - "value": "[reference(variables('name_uamiForPostDeploymentScript'),'${azure.apiVersionForDeployment}').outputs.uamidForPostDeployment.value]" + "value": "[reference(variables('name_uamiForPostDeploymentScript'),'2023-07-01').outputs.uamidForPostDeployment.value]" } } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.end}", + "apiVersion": "2023-07-01", + "name": "93da13bf-11f6-5bfb-9b51-7deb152a21c3", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('ref_clusterTemplate'))]", "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]", @@ -1390,19 +1390,19 @@ }, "wlsDomainLocation": { "type": "string", - "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.wlsDomainLocation.value]" + "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.wlsDomainLocation.value]" }, "adminHostName": { "type": "string", - "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminHostName.value]" + "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminHostName.value]" }, "adminConsole": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminConsole.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminConsole.value)]" }, "adminSecuredConsole": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminSecuredConsole.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminSecuredConsole.value)]" }, "ohsVMName": { "type": "string", @@ -1411,12 +1411,12 @@ "ohsAccessURL": { "type": "string", "condition": "[parameters('enableOHS')]", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'), parameters('ohshttpPort')),''),reference('ohsLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.ohsAccessURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'), parameters('ohshttpPort')),''),reference('ohsLinkedTemplate', '2023-07-01').outputs.ohsAccessURL.value)]" }, "ohsSecureAccessURL": { "type": "string", "condition": "[parameters('enableOHS')]", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'),parameters('ohshttpsPort')),''), reference('ohsLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.ohsSecureAccessURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'),parameters('ohshttpsPort')),''), reference('ohsLinkedTemplate', '2023-07-01').outputs.ohsSecureAccessURL.value)]" } } } \ No newline at end of file diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json index ba47748a4..0740e950e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json @@ -17,7 +17,7 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('vmName')]", "location": "[parameters('location')]", 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 0bd5719af..b56716a3a 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 @@ -110,8 +110,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.database.start}", + "apiVersion": "2023-07-01", + "name": "488f2f70-6999-5970-bae9-251097c2d0b6", "properties": { "mode": "Incremental", "template": { @@ -123,7 +123,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -147,8 +147,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.database.end}", + "apiVersion": "2023-07-01", + "name": "699d05c7-41f8-5512-aeef-f68651e247c2", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -164,8 +164,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${database.oracle}", + "apiVersion": "2023-07-01", + "name": "692b2d84-72f5-5992-a15d-0d5bcfef040d", "condition": "[if(contains(parameters('databaseType'), 'oracle'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -182,8 +182,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${database.postgresql}", + "apiVersion": "2023-07-01", + "name": "935df06e-a5d5-5bf1-af66-4c1eb71dac7a", "condition": "[if(contains(parameters('databaseType'), 'postgresql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -200,8 +200,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${database.mysql}", + "apiVersion": "2023-07-01", + "name": "41c353ae-6f7b-442f-b903-996cb42c1bbe", "condition": "[if(contains(parameters('databaseType'), 'mysql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -218,8 +218,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${database.sqlserver}", + "apiVersion": "2023-07-01", + "name": "3569588c-b89d-5567-84ee-a2c633c7204c", "condition": "[if(contains(parameters('databaseType'), 'sqlserver'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json index 35316550f..a3ebbc105 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json @@ -60,7 +60,7 @@ "resources": [ { "type": "Microsoft.Network/dnszones", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "name": "[parameters('dnszoneName')]", "location": "[parameters('location')]", "properties": { @@ -69,7 +69,7 @@ }, { "type": "Microsoft.Network/dnszones/A", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "condition": "[variables('const_hasARecords')]", "name": "[concat(parameters('dnszoneName'), '/', variables('const_dnszonesARecordSetNames')[copyIndex()])]", "copy": { @@ -88,7 +88,7 @@ }, { "type": "Microsoft.Network/dnszones/CNAME", - "apiVersion": "${azure.apiVersionForDNSZone}", + "apiVersion": "2023-07-01-preview", "condition": "[variables('const_hasCNAMERecords')]", "name": "[concat(parameters('dnszoneName'),'/', variables('const_dnszonesCNAMERecordSetNames')[copyIndex()])]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json index c8d6c3eeb..3f07c518b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json @@ -17,13 +17,13 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "${azure.apiVersionForIdentity}", + "apiVersion": "2023-01-31", "name": "[parameters('uamiName')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_deploymentScriptContributorRoleAssignmentName')]", "subscriptionId": "[subscription().subscriptionId]", "location": "[parameters('location')]", @@ -60,7 +60,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "${azure.apiVersionForRoleAssignment}", + "apiVersion": "2022-04-01", "name": "[variables('name_roleAssignmentName')]", "properties": { "description": "Assign subscription scope role to User Assigned Managed Identity ", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json index b03e9d1c1..79ee69b06 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json @@ -113,7 +113,7 @@ { "type": "Microsoft.Resources/deployments", "name": "uamiDeployment", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "properties": { "mode": "Incremental", "templateLink": { @@ -132,7 +132,7 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "${azure.apiVersionForDeploymentScript}", + "apiVersion": "2023-08-01", "name": "[concat('script-create-dns-records-', parameters('_globalResourceNameSuffix'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'uamiDeployment')]" @@ -147,7 +147,7 @@ "kind": "AzureCLI", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "AzCliVersion": "${azure.cli.version}", + "AzCliVersion": "2.53.0", "timeout": "PT30M", "environmentVariables": [ { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json index 68a2cfc29..bcbc3e8c0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json @@ -100,7 +100,7 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('const_managedVMPrefix'), copyIndex(1),'/newuserscript')]", "location": "[parameters('location')]", @@ -124,7 +124,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'), '/newuserscript')]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json index f5d330105..c301bca81 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json @@ -114,7 +114,7 @@ }, "variables": { "const_connectionString": "[if(and(equals(parameters('databaseType'),'sqlserver'), equals(last(parameters('dsConnectionURL')),';')), take(parameters('dsConnectionURL'), add(length(parameters('dsConnectionURL')),-1)),parameters('dsConnectionURL'))]", - "const_identityAPIVersion": "${azure.apiVersionForIdentity}", + "const_identityAPIVersion": "2023-01-31", "const_managedVMPrefix": "[concat(parameters('managedVMNamePrefix'), 'VM')]", "const_msiDefaultUser": "msiUser", "name_appendIdentityTemplate": "_appendUserManagedIdentity.json", @@ -148,8 +148,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.pswless.database.start}", + "apiVersion": "2023-07-01", + "name": "2d02881c-c7d2-5e16-b9b8-c48ebf70d2ab", "properties": { "mode": "Incremental", "template": { @@ -161,7 +161,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[concat('assignDbIdentityTo',variables('const_managedVMPrefix'), copyIndex(1))]", "copy": { "name": "virtualMachineIdentityLoop", @@ -181,7 +181,7 @@ "value": "[variables('obj_dbIdentity')]" }, "existingIdentities": { - "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" + "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" }, "location": { "value": "[parameters('location')]" @@ -191,7 +191,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "installJdbcLibsTemplate", "condition": "[or(equals(parameters('databaseType'),'mysql'), equals(parameters('databaseType'),'postgresql'))]", "dependsOn": [ @@ -245,7 +245,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "passwordlessDatasourceDeployment", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'installJdbcLibsTemplate')]" @@ -298,8 +298,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.pswless.database.end}", + "apiVersion": "2023-07-01", + "name": "fd30aea8-ec77-557b-ba12-4de15018a64a", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'passwordlessDatasourceDeployment')]" ], 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 1cb112af3..0515b4ceb 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 @@ -357,8 +357,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.cluster.start}", + "apiVersion": "2023-07-01", + "name": "22e98104-2229-5ec7-9a90-12edca3d88e7", "properties": { "mode": "Incremental", "template": { @@ -371,8 +371,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.ssl.start}", + "apiVersion": "2023-07-01", + "name": "f6e45a7a-d491-58a1-a951-fad252e1a396", "properties": { "mode": "Incremental", "template": { @@ -384,7 +384,7 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkSecurityGroups", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", @@ -435,7 +435,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "${azure.apiVersionForStorage}", + "apiVersion": "2025-01-01", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -447,7 +447,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPrivateEndpoint}", + "apiVersion": "2023-06-01", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", "location": "[parameters('location')]", @@ -474,7 +474,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -486,7 +486,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -497,7 +497,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'existing'),createObject(parameters('const_guidTag'),''),createObject())]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", @@ -514,7 +514,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", @@ -540,7 +540,7 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", @@ -575,7 +575,7 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -608,7 +608,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", @@ -655,7 +655,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -666,7 +666,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'),copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", @@ -692,14 +692,14 @@ ] }, "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')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0], ' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "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')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0], ' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.ssl.end}", + "apiVersion": "2023-07-01", + "name": "325d251a-fcba-5bd8-ad50-5682b3565ef5", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -715,8 +715,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.cluster.end}", + "apiVersion": "2023-07-01", + "name": "515d22ac-ff8c-5faa-aca1-3605ab5d2034", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -732,8 +732,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol91}", + "apiVersion": "2023-07-01", + "name": "cd48f178-52a3-415e-88bb-caa45f615b94", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -750,8 +750,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol87}", + "apiVersion": "2023-07-01", + "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -768,8 +768,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol91}", + "apiVersion": "2023-07-01", + "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -786,8 +786,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol87}", + "apiVersion": "2023-07-01", + "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -804,8 +804,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol91}", + "apiVersion": "2023-07-01", + "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -822,8 +822,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol87}", + "apiVersion": "2023-07-01", + "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -840,8 +840,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol76}", + "apiVersion": "2023-07-01", + "name": "6637154a-06d2-4ac0-82ab-2a1d7e391eab", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -858,8 +858,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol76}", + "apiVersion": "2023-07-01", + "name": "060d9c3f-cc20-4380-a383-fd20594e5b2a", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -876,8 +876,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol76}", + "apiVersion": "2023-07-01", + "name": "3220431f-33d4-416a-8df7-a0fcc23a25e4", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -894,8 +894,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel87}", + "apiVersion": "2023-07-01", + "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -912,8 +912,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -930,8 +930,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -948,8 +948,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel76}", + "apiVersion": "2023-07-01", + "name": "0a52f317-8b40-4a77-9f3c-7607fc3ebfb7wls", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -966,8 +966,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel76}", + "apiVersion": "2023-07-01", + "name": "26ec5cf5-dd84-4764-97cf-4f830facbf66wls", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -984,8 +984,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel76}", + "apiVersion": "2023-07-01", + "name": "ada2e3e6-faef-4339-aaac-40bcdc4484ecwls", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1016,15 +1016,15 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "storageAccountName": { "type": "string", 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 c72937b6a..39c2adc21 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 @@ -300,8 +300,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.cluster.start}", + "apiVersion": "2023-07-01", + "name": "22e98104-2229-5ec7-9a90-12edca3d88e7", "properties": { "mode": "Incremental", "template": { @@ -313,7 +313,7 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkSecurityGroups", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", @@ -364,7 +364,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "${azure.apiVersionForStorage}", + "apiVersion": "2025-01-01", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -376,7 +376,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPrivateEndpoint}", + "apiVersion": "2023-06-01", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", "location": "[parameters('location')]", @@ -403,7 +403,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -415,7 +415,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "${azure.apiVersionForStorageFileService}", + "apiVersion": "2025-01-01", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -426,7 +426,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'existing'),createObject(parameters('const_guidTag'),''),createObject())]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", @@ -443,7 +443,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", @@ -469,7 +469,7 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", @@ -504,7 +504,7 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -537,7 +537,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", @@ -584,7 +584,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -595,7 +595,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'),copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", @@ -621,14 +621,14 @@ ] }, "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')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0], ' ', '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')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0], ' ', 'false','\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.cluster.end}", + "apiVersion": "2023-07-01", + "name": "515d22ac-ff8c-5faa-aca1-3605ab5d2034", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -644,8 +644,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol91}", + "apiVersion": "2023-07-01", + "name": "cd48f178-52a3-415e-88bb-caa45f615b94", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -662,8 +662,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol87}", + "apiVersion": "2023-07-01", + "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -680,8 +680,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol91}", + "apiVersion": "2023-07-01", + "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -698,8 +698,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol87}", + "apiVersion": "2023-07-01", + "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -716,8 +716,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol91}", + "apiVersion": "2023-07-01", + "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -734,8 +734,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol87}", + "apiVersion": "2023-07-01", + "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -752,8 +752,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol76}", + "apiVersion": "2023-07-01", + "name": "6637154a-06d2-4ac0-82ab-2a1d7e391eab", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -770,8 +770,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol76}", + "apiVersion": "2023-07-01", + "name": "060d9c3f-cc20-4380-a383-fd20594e5b2a", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -788,8 +788,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol76}", + "apiVersion": "2023-07-01", + "name": "3220431f-33d4-416a-8df7-a0fcc23a25e4", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -806,8 +806,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel87}", + "apiVersion": "2023-07-01", + "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -824,8 +824,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -842,8 +842,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel87}", + "apiVersion": "2023-07-01", + "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -860,8 +860,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel76}", + "apiVersion": "2023-07-01", + "name": "0a52f317-8b40-4a77-9f3c-7607fc3ebfb7wls", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -878,8 +878,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel76}", + "apiVersion": "2023-07-01", + "name": "26ec5cf5-dd84-4764-97cf-4f830facbf66wls", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -896,8 +896,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel76}", + "apiVersion": "2023-07-01", + "name": "ada2e3e6-faef-4339-aaac-40bcdc4484ecwls", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -928,15 +928,15 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "storageAccountName": { "type": "string", 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 915359efa..ef5436675 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 @@ -322,8 +322,8 @@ ], "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.coherence.start}", + "apiVersion": "2023-07-01", + "name": "157ea604-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -336,7 +336,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmPrefix'),copyIndex(1),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -352,13 +352,13 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmPrefix'), copyIndex(1), variables('name_nic'))]", "location": "[parameters('location')]", @@ -390,7 +390,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmPrefix'), copyIndex(1))]", "location": "[parameters('location')]", @@ -435,7 +435,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -448,7 +448,7 @@ { "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('name_vmPrefix'), copyIndex(),'/newuserscript'))]", - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "location": "[parameters('location')]", "copy": { "name": "virtualMachineExtensionLoop", @@ -472,13 +472,13 @@ ] }, "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')), '${azure.apiVersionForStorage}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'), ' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',parameters('sslCustomIdentityKeyStoreType'),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',parameters('sslCustomTrustKeyStoreType'),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "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')), '2025-01-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'), ' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',parameters('sslCustomIdentityKeyStoreType'),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',parameters('sslCustomTrustKeyStoreType'),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.coherence.end}", + "apiVersion": "2023-07-01", + "name": "157ea51e-12ae-11eb-adc1-0242ac120002", "type": "Microsoft.Resources/deployments", "dependsOn": [ "virtualMachineExtensionLoop" 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 b29bde02a..449a33e15 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 @@ -134,7 +134,7 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "pswlessDbTemplate", "condition": "[parameters('enablePswlessConnection')]", "properties": { @@ -197,7 +197,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "upgradeMySQLJdbcDriverTemplate", "condition": "[and(not(parameters('enablePswlessConnection')), equals(parameters('databaseType'),'mysql'))]", "properties": { @@ -248,7 +248,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "passwordDatasourceDeployment", "condition": "[not(parameters('enablePswlessConnection'))]", "dependsOn": [ diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json index f40e26e1e..bd87c11cc 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json @@ -105,8 +105,8 @@ }, "resources": [ { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.dns.start}", + "apiVersion": "2023-07-01", + "name": "c40d7aa8-9fe7-51c6-86de-27e1b1678735", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -119,7 +119,7 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "type": "Microsoft.Resources/deployments", "name": "createDNSZone", "condition": "[not(parameters('hasDNSZones'))]", @@ -155,7 +155,7 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "type": "Microsoft.Resources/deployments", "name": "updateDNSZone", "condition": "[parameters('hasDNSZones')]", @@ -206,8 +206,8 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${cluster.dns.end}", + "apiVersion": "2023-07-01", + "name": "022d99e3-8ba3-5822-b6d5-bcec64518286", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json index e74edab2b..c82c91e9b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json @@ -29,7 +29,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsAllowed')]", "condition": "[not(parameters('denyPublicTrafficForAdminServer'))]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "TCP", "sourcePortRange": "*", @@ -48,7 +48,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsDenied')]", "condition": "[parameters('denyPublicTrafficForAdminServer')]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -67,7 +67,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsAllowed')]", "condition": "[and(not(parameters('denyPublicTrafficForManagedServer')), parameters('enableOHS'))]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -85,7 +85,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsDenied')]", "condition": "[and(parameters('denyPublicTrafficForManagedServer'), parameters('enableOHS'))]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "*", "sourcePortRange": "*", 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 d1c110e96..a44de6275 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 @@ -244,7 +244,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[concat(parameters('nsgName'),'/','OHSPorts')]", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "apiVersion": "2023-06-01", "properties": { "protocol": "TCP", "sourcePortRange": "*", @@ -257,7 +257,7 @@ } }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(parameters('ohsVMName'),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -269,13 +269,13 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(parameters('virtualNetworkName'), '/', variables('name_subnet'))]", "condition": "[and(empty(parameters('virtualNetworkName')), empty(variables('name_subnet')))]" }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(parameters('ohsVMName'), variables('name_nic'))]", "location": "[parameters('location')]", @@ -303,7 +303,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('ohsVMName')]", "location": "[parameters('location')]", @@ -344,7 +344,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -355,7 +355,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('ohsVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -385,15 +385,15 @@ }, "ohsHostName": { "type": "string", - "value": "[reference(variables('name_outputOHSHost'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn]" + "value": "[reference(variables('name_outputOHSHost'), '2023-06-01').dnsSettings.fqdn]" }, "ohsAccessURL": { "type": "string", - "value": "[uri(format('http://{0}:{1}',reference(variables('name_outputOHSHost'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,parameters('ohshttpPort')),'')]" + "value": "[uri(format('http://{0}:{1}',reference(variables('name_outputOHSHost'), '2023-06-01').dnsSettings.fqdn,parameters('ohshttpPort')),'')]" }, "ohsSecureAccessURL": { "type": "string", - "value": "[uri(format('https://{0}:{1}',reference(variables('name_outputOHSHost'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,parameters('ohshttpsPort')),'')]" + "value": "[uri(format('https://{0}:{1}',reference(variables('name_outputOHSHost'), '2023-06-01').dnsSettings.fqdn,parameters('ohshttpsPort')),'')]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json index 37ed87e2f..b26623dfc 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json @@ -56,7 +56,7 @@ "resources": [ { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "${azure.apiVersionForDeploymentScript}", + "apiVersion": "2023-08-01", "name": "[concat('postdeployscript-', parameters('_globalResourceNameSuffix'))]", "kind": "AzureCLI", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json index 359c76050..2d568a7a8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json @@ -30,13 +30,13 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "${azure.apiVersionForIdentity}", + "apiVersion": "2023-01-31", "name": "[variables('name_postDeploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", + "apiVersion": "2023-07-01", "name": "[variables('name_postDeploymentScriptRoleAssignment')]", "location": "[parameters('location')]", "subscriptionId": "[subscription().subscriptionId]", @@ -68,7 +68,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "${azure.apiVersionForRoleAssignment}", + "apiVersion": "2022-04-01", "name": "[variables('roleAssignmentGuid')]", "properties": { "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', parameters('innerRoleDefinitionId'))]", 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 4677f1b92..e4bef0b4d 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 @@ -101,8 +101,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.deletenode.start}", + "apiVersion": "2023-07-01", + "name": "931c2901-224a-5cc6-b235-41fa162b7532", "properties": { "mode": "Incremental", "template": { @@ -114,7 +114,7 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -135,8 +135,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${dynamic.deletenode.end}", + "apiVersion": "2023-07-01", + "name": "3eb27f94-d1c3-572c-a7da-0d7f26f6a20e", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json index 88c20f542..99a52dc59 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json @@ -94,7 +94,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - ${azure.armBased.vmSize.list} + "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" ] }, "osPlatform": "Linux", @@ -306,13 +306,13 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "${identifier.virtualMachines}", - "${identifier.virtualNetworks}", - "${identifier.networkInterfaces}", - "${identifier.networkSecurityGroups}", - "${identifier.publicIPAddresses}", - "${identifier.storageAccounts}", - "${identifier.resourcesDeployment}" + "Microsoft.Compute/virtualMachines", + "Microsoft.Network/virtualNetworks", + "Microsoft.Network/networkInterfaces", + "Microsoft.Network/networkSecurityGroups", + "Microsoft.Network/publicIPAddresses", + "Microsoft.Storage/storageAccounts", + "Microsoft resources deployment" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json index 190909ada..a3afaa0be 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json @@ -76,7 +76,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "${label.tagsLabel}" + "description": "Tags for the resources." } }, "usePreviewImage": { @@ -170,9 +170,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", - "name": "${start}", + "apiVersion": "2023-07-01", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "name": "b446fe15-5d43-5549-858d-4775741cd0ba", "properties": { "mode": "Incremental", "template": { @@ -184,8 +184,8 @@ }, { "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.networkSecurityGroups}')]", + "apiVersion": "2023-06-01", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft.Network/networkSecurityGroups')]", "name": "[variables('name_networkSecurityGroup')]", "location": "[parameters('location')]", "properties": { @@ -208,8 +208,8 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "${azure.apiVersionForStorage}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.storageAccounts}')]", + "apiVersion": "2025-01-01", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts')]", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -219,9 +219,9 @@ "properties": {} }, { - "apiVersion": "${azure.apiVersionForPublicIPAddresses}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.publicIPAddresses}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses')]", "name": "[variables('name_publicIPAddress')]", "location": "[parameters('location')]", "properties": { @@ -232,9 +232,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualNetworks}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/virtualNetworks", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualNetworks}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", "dependsOn": [ @@ -260,9 +260,9 @@ } }, { - "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "apiVersion": "2023-06-01", "type": "Microsoft.Network/networkInterfaces", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkInterfaces}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces')]", "name": "[variables('name_nic')]", "location": "[parameters('location')]", "dependsOn": [ @@ -290,9 +290,9 @@ } }, { - "apiVersion": "${azure.apiVersionForVirtualMachines}", + "apiVersion": "2024-11-01", "type": "Microsoft.Compute/virtualMachines", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/virtualMachines')]", "name": "[variables('name_vmName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -334,7 +334,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" } } }, @@ -345,10 +345,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${end}", + "apiVersion": "2023-07-01", + "name": "pid-a63dea86-f8db-4e75-a231-1145d4f3ab6e-partnercenter", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], @@ -362,10 +362,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk21-ol94}", + "apiVersion": "2023-07-01", + "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -381,10 +381,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk21-ol810}", + "apiVersion": "2023-07-01", + "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -400,10 +400,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk17-ol94}", + "apiVersion": "2023-07-01", + "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -419,10 +419,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141200-jdk17-ol810}", + "apiVersion": "2023-07-01", + "name": "69b6b433-1679-4d37-af25-3d56987c217a", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -438,10 +438,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol91}", + "apiVersion": "2023-07-01", + "name": "cd48f178-52a3-415e-88bb-caa45f615b94", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -457,10 +457,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol87}", + "apiVersion": "2023-07-01", + "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -476,10 +476,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol91}", + "apiVersion": "2023-07-01", + "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -495,10 +495,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol87}", + "apiVersion": "2023-07-01", + "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -514,10 +514,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol91}", + "apiVersion": "2023-07-01", + "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -533,10 +533,10 @@ } }, { - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol87}", + "apiVersion": "2023-07-01", + "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -553,9 +553,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol76}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "6637154a-06d2-4ac0-82ab-2a1d7e391eab", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -572,9 +572,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol76}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "060d9c3f-cc20-4380-a383-fd20594e5b2a", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -591,9 +591,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol76}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "3220431f-33d4-416a-8df7-a0fcc23a25e4", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -610,9 +610,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel87}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -629,9 +629,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel87}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -648,9 +648,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel87}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -667,9 +667,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel76}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "0a52f317-8b40-4a77-9f3c-7607fc3ebfb7wls", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -686,9 +686,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel76}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "26ec5cf5-dd84-4764-97cf-4f830facbf66wls", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -705,9 +705,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel76}", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "apiVersion": "2023-07-01", + "name": "ada2e3e6-faef-4339-aaac-40bcdc4484ecwls", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" From 319c86fbdb75c85fd8d2b9f462400a5da5602cf9 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Fri, 26 Sep 2025 12:58:32 +0000 Subject: [PATCH 3/5] fix validation errors in mainTemplate.bicep --- weblogic-azure-aks/src/main/bicep/mainTemplate.bicep | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep index e48eaba5f..151568cfa 100644 --- a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep +++ b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep @@ -794,18 +794,18 @@ module queryWLSDomainConfig 'modules/_deployment-scripts/_ds-output-domain-confi } output aksClusterName string = ref_wlsDomainDeployment.outputs.aksClusterName -output adminConsoleInternalUrl string = ref_wlsDomainDeployment.outputs.adminServerEndpoint +output adminConsoleInternalUrl string = ref_wlsDomainDeployment.outputs.adminServerEndPoint output adminConsoleExternalUrl string = const_showAdminConsoleExUrl ? networkingDeployment.outputs.adminConsoleExternalEndpoint : '' output adminConsoleExternalSecuredUrl string = const_showAdminConsoleExUrl ? networkingDeployment.outputs.adminConsoleExternalSecuredEndpoint : '' // If TLS/SSL enabled, only secured url is working, will not output HTTP url. output adminRemoteConsoleUrl string = const_showRemoteAdminConsoleExUrl ? networkingDeployment.outputs.adminRemoteConsoleEndpoint : '' output adminRemoteConsoleSecuredUrl string = const_showRemoteAdminConsoleSecuredExUrl ? networkingDeployment.outputs.adminRemoteConsoleSecuredEndpoint : '' -output adminServerT3InternalUrl string = ref_wlsDomainDeployment.outputs.adminServerT3InternalEndpoint +output adminServerT3InternalUrl string = ref_wlsDomainDeployment.outputs.adminServerT3InternalEndPoint output adminServerT3ExternalUrl string = enableAdminT3Tunneling && const_enableNetworking ? networkingDeployment.outputs.adminServerT3ChannelEndpoint : '' -output clusterInternalUrl string = ref_wlsDomainDeployment.outputs.clusterEndpoint +output clusterInternalUrl string = ref_wlsDomainDeployment.outputs.clusterEndPoint output clusterExternalUrl string = const_enableNetworking ? networkingDeployment.outputs.clusterExternalEndpoint : '' output clusterExternalSecuredUrl string = const_enableNetworking ? networkingDeployment.outputs.clusterExternalSecuredEndpoint : '' -output clusterT3InternalUrl string = ref_wlsDomainDeployment.outputs.clusterT3InternalEndpoint +output clusterT3InternalUrl string = ref_wlsDomainDeployment.outputs.clusterT3InternalEndPoint output clusterT3ExternalEndpoint string = enableClusterT3Tunneling && const_enableNetworking ? networkingDeployment.outputs.clusterT3ChannelEndpoint : '' output kedaScalerServerAddress string = enableAutoscaling ? horizontalAutoscaling.outputs.kedaScalerServerAddress : '' output shellCmdtoConnectAks string = format('az account set --subscription {0}; az aks get-credentials --resource-group {1} --name {2}', split(subscription().id, '/')[2], ref_wlsDomainDeployment.outputs.aksClusterRGName, ref_wlsDomainDeployment.outputs.aksClusterName) From 4d150c51ef812444f29fad972070a5b673616486 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Sat, 27 Sep 2025 08:31:39 +0000 Subject: [PATCH 4/5] Revert "hard-code pids for passwordchange-test" This reverts commit 4bff3fd66271246d1eca1c55163f2effac8746a3. --- .../src/main/arm/createUiDefinition.json | 32 ++-- .../src/main/bicep/mainTemplate.bicep | 34 ++-- .../src/main/bicep/modules/_appGateway.bicep | 4 +- .../bicep/modules/_azure-resoruces/_acr.bicep | 6 +- .../bicep/modules/_azure-resoruces/_aks.bicep | 12 +- .../_azure-resoruces/_aksPodIdentity.bicep | 2 +- .../_azure-resoruces/_appgateway.bicep | 10 +- .../_autoGeneratedPfxCertInKeyVault.bicep | 12 +- .../modules/_azure-resoruces/_dnsZones.bicep | 6 +- .../modules/_azure-resoruces/_storage.bicep | 8 +- .../_azure-resoruces/_vnetAppGateway.bicep | 14 +- .../_ds-create-networking.bicep | 6 +- .../_ds-create-wls-cluster.bicep | 8 +- .../_ds-datasource-connection.bicep | 6 +- .../_ds-output-domain-configurations.bicep | 6 +- .../_ds-validate-applications.bicep | 6 +- .../_ds-validate-parameters.bicep | 6 +- .../_deployment-scripts/_ds_enable_hpa.bicep | 6 +- .../_ds_enable_prometheus_metrics.bicep | 6 +- .../_ds_ensure_available_agic.bicep | 2 +- .../_ds_install_agic.bicep | 6 +- ...ery_available_private_ip_from_subnet.bicep | 6 +- .../_ds_update-applications.bicep | 2 +- .../_ds_validate_agic.bicep | 6 +- .../bicep/modules/_enableAutoScaling.bicep | 2 +- .../bicep/modules/_enablePromethuesKeda.bicep | 16 +- .../bicep/modules/_globalUamiAndRoles.bicep | 6 +- .../modules/_preDeployedAzureResources.bicep | 2 +- .../_agicNetworkContributor.bicep | 4 +- .../_agicRoleAssignment.bicep | 4 +- .../_aksClusterMioRoleOverDbIdentity.bicep | 6 +- .../_roleAssignmentinRgScope.bicep | 4 +- .../_roleAssignmentinSubscription.bicep | 4 +- .../bicep/modules/_setupDBConnection.bicep | 2 +- .../_setupPasswordlessDBConnection.bicep | 4 +- .../src/main/bicep/modules/networking.bicep | 2 +- .../bicep/modules/setupWebLogicCluster.bicep | 4 +- .../src/main/arm/mainTemplate.json | 6 +- .../src/main/arm/createUiDefinition.json | 26 +-- .../src/main/arm/mainTemplate.json | 86 ++++----- .../_appendUserManagedIdentity.json | 2 +- .../main/arm/nestedtemplates/_dbTemplate.json | 42 ++--- .../_dnszones/_createDNSZonesTemplate.json | 10 +- .../_dnszones/_uamiAndRoleAssignment.json | 12 +- .../_dnszones/_updateDNSZonesTemplate.json | 12 +- .../_installJdbcLibsTemplate.json | 6 +- .../nestedtemplates/_pswlessDbTemplate.json | 30 ++-- .../arm/nestedtemplates/adminTemplate.json | 136 +++++++-------- .../adminTemplateForCustomSSL.json | 148 ++++++++-------- .../main/arm/nestedtemplates/dbTemplate.json | 14 +- .../arm/nestedtemplates/dnszonesTemplate.json | 24 +-- .../nestedtemplates/nsgNestedTemplate.json | 4 +- .../postDeploymentTemplate.json | 6 +- .../postDeploymentUAMIRolesTemplate.json | 10 +- .../src/main/arm/mainTemplate.json | 22 +-- .../addnode/src/main/arm/mainTemplate.json | 24 +-- .../src/main/arm/createUiDefinition.json | 32 ++-- .../src/main/arm/mainTemplate.json | 118 ++++++------- .../_appGatewayConnectorTemplate.json | 24 +-- .../_appendUserManagedIdentity.json | 2 +- .../main/arm/nestedtemplates/_dbTemplate.json | 42 ++--- .../_dnszones/_createDNSZonesTemplate.json | 10 +- .../_dnszones/_uamiAndRoleAssignment.json | 12 +- .../_dnszones/_updateDNSZonesTemplate.json | 12 +- .../_installJdbcLibsTemplate.json | 6 +- .../_keyvaultWithNewCertTemplate.json | 18 +- .../nestedtemplates/_pswlessDbTemplate.json | 30 ++-- .../appGatewayNestedTemplate.json | 36 ++-- .../clusterCustomSSLTemplate.json | 164 +++++++++--------- .../arm/nestedtemplates/clusterTemplate.json | 152 ++++++++-------- .../nestedtemplates/coherenceTemplate.json | 36 ++-- .../main/arm/nestedtemplates/dbTemplate.json | 14 +- .../arm/nestedtemplates/dnszonesTemplate.json | 22 +-- .../nestedtemplates/nsgNestedTemplate.json | 8 +- .../postDeploymentTemplate.json | 8 +- .../postDeploymentUAMIRolesTemplate.json | 18 +- .../deletenode/src/main/arm/mainTemplate.json | 10 +- .../src/main/arm/mainTemplate.json | 22 +-- .../addnode/src/main/arm/mainTemplate.json | 22 +-- .../src/main/arm/createUiDefinition.json | 2 +- .../src/main/arm/mainTemplate.json | 54 +++--- .../_appendUserManagedIdentity.json | 2 +- .../main/arm/nestedtemplates/_dbTemplate.json | 26 +-- .../_dnszones/_createDNSZonesTemplate.json | 6 +- .../_dnszones/_uamiAndRoleAssignment.json | 6 +- .../_dnszones/_updateDNSZonesTemplate.json | 6 +- .../_installJdbcLibsTemplate.json | 4 +- .../nestedtemplates/_pswlessDbTemplate.json | 18 +- .../clusterCustomSSLTemplate.json | 108 ++++++------ .../arm/nestedtemplates/clusterTemplate.json | 100 +++++------ .../nestedtemplates/coherenceTemplate.json | 22 +-- .../main/arm/nestedtemplates/dbTemplate.json | 6 +- .../arm/nestedtemplates/dnszonesTemplate.json | 12 +- .../nestedtemplates/nsgNestedTemplate.json | 8 +- .../nestedtemplates/ohsNestedTemplate.json | 20 +-- .../postDeploymentTemplate.json | 2 +- .../postDeploymentUAMIRolesTemplate.json | 6 +- .../deletenode/src/main/arm/mainTemplate.json | 10 +- .../src/main/arm/createUiDefinition.json | 16 +- .../src/main/arm/mainTemplate.json | 154 ++++++++-------- 100 files changed, 1149 insertions(+), 1149 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 02814a8ba..7600b9c04 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -2078,22 +2078,22 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "Microsoft.ContainerService/managedClusters", - "Microsoft.Network/applicationGateways", - "Microsoft.ContainerRegistry/registries", - "Microsoft.Compute/virtualMachines", - "Virtual machine extension", - "Microsoft.Network/virtualNetworks", - "Microsoft.Network/networkInterfaces", - "Microsoft.Network/networkSecurityGroups", - "Microsoft.Network/publicIPAddresses", - "Microsoft.Storage/storageAccounts", - "Microsoft.KeyVault/vaults", - "Microsoft.ManagedIdentity/userAssignedIdentities", - "Microsoft.Network/dnszones", - "Microsoft.OperationalInsights/workspaces", - "Microsoft.Monitor/accounts", - "Microsoft.Resources/deploymentScripts" + "${identifier.managedClusters}", + "${identifier.applicationGateways}", + "${identifier.registries}", + "${identifier.virtualMachines}", + "${identifier.virtualMachinesExtensions}", + "${identifier.virtualNetworks}", + "${identifier.networkInterfaces}", + "${identifier.networkSecurityGroups}", + "${identifier.publicIPAddresses}", + "${identifier.storageAccounts}", + "${identifier.vaults}", + "${identifier.userAssignedIdentities}", + "${identifier.dnszones}", + "${identifier.workspaces}", + "${identifier.accounts}", + "${identifier.deploymentScripts}" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep index 151568cfa..ee1320466 100644 --- a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep +++ b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep @@ -199,7 +199,7 @@ param sslUploadedPrivateKeyAlias string = newGuid() @secure() @description('Password of the private key') param sslUploadedPrivateKeyPassPhrase string = newGuid() -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object = {} @description('Public port of the custom T3 channel in admin server') param t3ChannelAdminPort int = 7005 @@ -266,22 +266,22 @@ var _enableAppGWIngress = enableAppGWIngress // We can streamline the following code with a user-defined function, but it is not supported in Partner Center. // For status, see https://dev.azure.com/edburns-msft/Open%20Standard%20Enterprise%20Java%20(Java%20EE)%20on%20Azure/_workitems/edit/6219 var _objTagsByResource = { - 'Microsoft.Monitor/accounts': contains(tagsByResource, 'Microsoft.Monitor/accounts') ? tagsByResource['Microsoft.Monitor/accounts'] : json('{}') - 'Microsoft.ContainerService/managedClusters': contains(tagsByResource, 'Microsoft.ContainerService/managedClusters') ? tagsByResource['Microsoft.ContainerService/managedClusters'] : json('{}') - 'Microsoft.Network/applicationGateways': contains(tagsByResource, 'Microsoft.Network/applicationGateways') ? tagsByResource['Microsoft.Network/applicationGateways'] : json('{}') - 'Microsoft.ContainerRegistry/registries': contains(tagsByResource, 'Microsoft.ContainerRegistry/registries') ? tagsByResource['Microsoft.ContainerRegistry/registries'] : json('{}') - 'Microsoft.Compute/virtualMachines': contains(tagsByResource, 'Microsoft.Compute/virtualMachines') ? tagsByResource['Microsoft.Compute/virtualMachines'] : json('{}') - 'Virtual machine extension': contains(tagsByResource, 'Virtual machine extension') ? tagsByResource['Virtual machine extension'] : json('{}') - 'Microsoft.Network/virtualNetworks': contains(tagsByResource, 'Microsoft.Network/virtualNetworks') ? tagsByResource['Microsoft.Network/virtualNetworks'] : json('{}') - 'Microsoft.Network/networkInterfaces': contains(tagsByResource, 'Microsoft.Network/networkInterfaces') ? tagsByResource['Microsoft.Network/networkInterfaces'] : json('{}') - 'Microsoft.Network/networkSecurityGroups': contains(tagsByResource, 'Microsoft.Network/networkSecurityGroups') ? tagsByResource['Microsoft.Network/networkSecurityGroups'] : json('{}') - 'Microsoft.Network/publicIPAddresses': contains(tagsByResource, 'Microsoft.Network/publicIPAddresses') ? tagsByResource['Microsoft.Network/publicIPAddresses'] : json('{}') - 'Microsoft.Storage/storageAccounts': contains(tagsByResource, 'Microsoft.Storage/storageAccounts') ? tagsByResource['Microsoft.Storage/storageAccounts'] : json('{}') - 'Microsoft.KeyVault/vaults': contains(tagsByResource, 'Microsoft.KeyVault/vaults') ? tagsByResource['Microsoft.KeyVault/vaults'] : json('{}') - 'Microsoft.ManagedIdentity/userAssignedIdentities': contains(tagsByResource, 'Microsoft.ManagedIdentity/userAssignedIdentities') ? tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] : json('{}') - 'Microsoft.Network/dnszones': contains(tagsByResource, 'Microsoft.Network/dnszones') ? tagsByResource['Microsoft.Network/dnszones'] : json('{}') - 'Microsoft.OperationalInsights/workspaces': contains(tagsByResource, 'Microsoft.OperationalInsights/workspaces') ? tagsByResource['Microsoft.OperationalInsights/workspaces'] : json('{}') - 'Microsoft.Resources/deploymentScripts': contains(tagsByResource, 'Microsoft.Resources/deploymentScripts') ? tagsByResource['Microsoft.Resources/deploymentScripts'] : json('{}') + '${identifier.accounts}': contains(tagsByResource, '${identifier.accounts}') ? tagsByResource['${identifier.accounts}'] : json('{}') + '${identifier.managedClusters}': contains(tagsByResource, '${identifier.managedClusters}') ? tagsByResource['${identifier.managedClusters}'] : json('{}') + '${identifier.applicationGateways}': contains(tagsByResource, '${identifier.applicationGateways}') ? tagsByResource['${identifier.applicationGateways}'] : json('{}') + '${identifier.registries}': contains(tagsByResource, '${identifier.registries}') ? tagsByResource['${identifier.registries}'] : json('{}') + '${identifier.virtualMachines}': contains(tagsByResource, '${identifier.virtualMachines}') ? tagsByResource['${identifier.virtualMachines}'] : json('{}') + '${identifier.virtualMachinesExtensions}': contains(tagsByResource, '${identifier.virtualMachinesExtensions}') ? tagsByResource['${identifier.virtualMachinesExtensions}'] : json('{}') + '${identifier.virtualNetworks}': contains(tagsByResource, '${identifier.virtualNetworks}') ? tagsByResource['${identifier.virtualNetworks}'] : json('{}') + '${identifier.networkInterfaces}': contains(tagsByResource, '${identifier.networkInterfaces}') ? tagsByResource['${identifier.networkInterfaces}'] : json('{}') + '${identifier.networkSecurityGroups}': contains(tagsByResource, '${identifier.networkSecurityGroups}') ? tagsByResource['${identifier.networkSecurityGroups}'] : json('{}') + '${identifier.publicIPAddresses}': contains(tagsByResource, '${identifier.publicIPAddresses}') ? tagsByResource['${identifier.publicIPAddresses}'] : json('{}') + '${identifier.storageAccounts}': contains(tagsByResource, '${identifier.storageAccounts}') ? tagsByResource['${identifier.storageAccounts}'] : json('{}') + '${identifier.vaults}': contains(tagsByResource, '${identifier.vaults}') ? tagsByResource['${identifier.vaults}'] : json('{}') + '${identifier.userAssignedIdentities}': contains(tagsByResource, '${identifier.userAssignedIdentities}') ? tagsByResource['${identifier.userAssignedIdentities}'] : json('{}') + '${identifier.dnszones}': contains(tagsByResource, '${identifier.dnszones}') ? tagsByResource['${identifier.dnszones}'] : json('{}') + '${identifier.workspaces}': contains(tagsByResource, '${identifier.workspaces}') ? tagsByResource['${identifier.workspaces}'] : json('{}') + '${identifier.deploymentScripts}': contains(tagsByResource, '${identifier.deploymentScripts}') ? tagsByResource['${identifier.deploymentScripts}'] : json('{}') } var const_aksName = createAKSCluster ? 'wlsonaks${const_globalResourceNameSuffix}' : aksClusterName var const_appGatewaySSLCertOptionGenerateCert = 'generateCert' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep index b3c46ab28..3c35a64ce 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep @@ -32,7 +32,7 @@ param trustedRootCertificateDeploymentName string @secure() param vnetForApplicationGateway object param vnetRGNameForApplicationGateway string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object // To mitigate arm-ttk error: Type Mismatch: Parameter in nested template is defined as string, but the parent template defines it as bool. @@ -59,7 +59,7 @@ module pidAppgwWithCustomCertificate './_pids/_pid.bicep' = if (_signedFrontendC } // get key vault object from a resource group -resource existingKeyvault 'Microsoft.KeyVault/vaults@2024-11-01' existing = { +resource existingKeyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' existing = { name: autoGeneratedSSLCertKeyVaultName } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep index f65a72d73..297f81567 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep @@ -3,10 +3,10 @@ param acrName string param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object -resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = { +resource registries 'Microsoft.ContainerRegistry/registries@${azure.apiVersionForContainerRegistries}' = { name: acrName location: location sku: { @@ -37,7 +37,7 @@ resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = { zoneRedundancy: 'Disabled' anonymousPullEnabled: false } - tags: tagsByResource['Microsoft.ContainerRegistry/registries'] + tags: tagsByResource['${identifier.registries}'] } output acrName string = acrName diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep index 5a3ffeb27..021434135 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep @@ -25,7 +25,7 @@ param aksVersion string = 'default' @description('In addition to the CPU and memory metrics included in AKS by default, you can enable Container Insights for more comprehensive data on the overall performance and health of your cluster. Billing is based on data ingestion and retention settings.') param enableAzureMonitoring bool = false param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -42,10 +42,10 @@ var obj_aciEnableOmsAgent = { } } -resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = if (enableAzureMonitoring) { +resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@${azure.apiVersionForInsightsWorkspaces}' = if (enableAzureMonitoring) { name: name_aciWorkspace location: location - tags: tagsByResource['Microsoft.OperationalInsights/workspaces'] + tags: tagsByResource['${identifier.workspaces}'] properties: { sku: { name: aciWorkspaceSku @@ -59,10 +59,10 @@ resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022 } } -resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { name: aksClusterName location: location - tags: tagsByResource['Microsoft.ContainerService/managedClusters'] + tags: tagsByResource['${identifier.managedClusters}'] properties: { kubernetesVersion: aksVersion dnsPrefix: '${aksClusterName}-dns' @@ -81,7 +81,7 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = { availabilityZones: agentAvailabilityZones mode: 'System' osType: 'Linux' - tags: tagsByResource['Microsoft.ContainerService/managedClusters'] + tags: tagsByResource['${identifier.managedClusters}'] } ] addonProfiles: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep index 09a711300..9b440d89f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep @@ -12,7 +12,7 @@ param location string var const_APIVersion = '2022-01-31-PREVIEW' -resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@2023-08-01' = { +resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { name: aksClusterName location: location properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep index ef8243796..beaa9cad8 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep @@ -20,7 +20,7 @@ param staticPrivateFrontentIP string = '10.0.0.1' @secure() param trustedRootCertData string = newGuid() param usePrivateIP bool = false -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -80,13 +80,13 @@ var obj_tagIngress = { 'managed-by-k8s-ingress': 'true' } -resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = { +resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@${azure.apiVersionForPublicIPAddresses}' = { name: gatewayPublicIPAddressName sku: { name: 'Standard' } location: location - tags: tagsByResource['Microsoft.Network/publicIPAddresses'] + tags: tagsByResource['${identifier.publicIPAddresses}'] properties: { publicIPAllocationMethod: 'Static' dnsSettings: { @@ -95,10 +95,10 @@ resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = { } } -resource wafv2AppGateway 'Microsoft.Network/applicationGateways@2023-06-01' = { +resource wafv2AppGateway 'Microsoft.Network/applicationGateways@${azure.apiVersionForApplicationGateways}' = { name: gatewayName location: location - tags: union(tagsByResource['Microsoft.Network/applicationGateways'], obj_tagIngress) + tags: union(tagsByResource['${identifier.applicationGateways}'], obj_tagIngress) properties: { sku: { name: 'WAF_v2' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep index 09de338b4..c7f4022f2 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep @@ -28,7 +28,7 @@ param sku string = 'Standard' @description('Subject name to create a new certificate, example: \'CN=contoso.com\'.') param subjectName string = 'contoso.xyz' -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -37,10 +37,10 @@ var obj_extraTag= { } var const_identityId = '${substring(string(identity.userAssignedIdentities), indexOf(string(identity.userAssignedIdentities), '"') + 1, lastIndexOf(string(identity.userAssignedIdentities), '"') - (indexOf(string(identity.userAssignedIdentities), '"') + 1))}' -resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = { +resource keyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' = { name: keyVaultName location: location - tags: union(tagsByResource['Microsoft.KeyVault/vaults'], obj_extraTag) + tags: union(tagsByResource['${identifier.vaults}'], obj_extraTag) properties: { sku: { family: 'A' @@ -63,15 +63,15 @@ resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = { } } -resource createAddCertificate 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource createAddCertificate 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-create-add-appgw-certificate-${_globalResourceNameSuffix}' location: location identity: identity kind: 'AzurePowerShell' - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { forceUpdateTag: utcValue - azPowerShellVersion: '11.5' + azPowerShellVersion: '${azure.powershell.version}' timeout: 'PT30M' arguments: ' -vaultName ${keyVaultName} -certificateName ${secretName} -subjectName ${subjectName}' scriptContent: '\n param(\n [string] [Parameter(Mandatory=$true)] $vaultName,\n [string] [Parameter(Mandatory=$true)] $certificateName,\n [string] [Parameter(Mandatory=$true)] $subjectName\n )\n\n $ErrorActionPreference = \'Stop\'\n $DeploymentScriptOutputs = @{}\n\n $existingCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n if ($existingCert -and $existingCert.Certificate.Subject -eq $subjectName) {\n\n Write-Host \'Certificate $certificateName in vault $vaultName is already present.\'\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $existingCert.Thumbprint\n $existingCert | Out-String\n }\n else {\n $policy = New-AzKeyVaultCertificatePolicy -SubjectName $subjectName -IssuerName Self -ValidityInMonths 12 -Verbose\n\n # private key is added as a secret that can be retrieved in the ARM template\n Add-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName -CertificatePolicy $policy -Verbose\n\n $newCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n # it takes a few seconds for KeyVault to finish\n $tries = 0\n do {\n Write-Host \'Waiting for certificate creation completion...\'\n Start-Sleep -Seconds 10\n $operation = Get-AzKeyVaultCertificateOperation -VaultName $vaultName -Name $certificateName\n $tries++\n\n if ($operation.Status -eq \'failed\')\n {\n throw \'Creating certificate $certificateName in vault $vaultName failed with error $($operation.ErrorMessage)\'\n }\n\n if ($tries -gt 120)\n {\n throw \'Timed out waiting for creation of certificate $certificateName in vault $vaultName\'\n }\n } while ($operation.Status -ne \'completed\')\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $newCert.Thumbprint\n $newCert | Out-String\n }\n ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep index 389aedea9..18f740809 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep @@ -1,12 +1,12 @@ @description('Azure DNS Zone name.') param dnszoneName string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object -resource dnszoneName_resource 'Microsoft.Network/dnszones@2023-07-01-preview' = { +resource dnszoneName_resource 'Microsoft.Network/dnszones@${azure.apiVersionForDNSZone}' = { name: dnszoneName location: 'global' - tags: tagsByResource['Microsoft.Network/dnszones'] + tags: tagsByResource['${identifier.dnszones}'] properties: { zoneType: 'Public' } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep index 741c31969..009b1a669 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep @@ -4,7 +4,7 @@ param fileShareName string param location string param storageAccountName string = 'stg-contoso' -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -14,11 +14,11 @@ var obj_extraTag = { 'created-by-azure-weblogic': utcValue } -resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = { +resource storageAccount 'Microsoft.Storage/storageAccounts@${azure.apiVersionForStorage}' = { name: storageAccountName location: location kind: 'StorageV2' - tags: union(tagsByResource['Microsoft.Storage/storageAccounts'], obj_extraTag) + tags: union(tagsByResource['${identifier.storageAccounts}'], obj_extraTag) sku: { name: const_sku tier: 'Standard' @@ -42,7 +42,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = { } } -resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@2025-01-01' = { +resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@${azure.apiVersionForStorageFileService}' = { name: '${storageAccount.name}/default/${fileShareName}' properties: { accessTier: 'TransactionOptimized' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep index d2e75ab0d..2a5badc4e 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep @@ -19,7 +19,7 @@ param vnetForApplicationGateway object = { } } } -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -30,22 +30,22 @@ var name_subnet = vnetForApplicationGateway.subnets.gatewaySubnet.name var name_vnet = vnetForApplicationGateway.name // Get existing VNET. -resource existingVnet 'Microsoft.Network/virtualNetworks@2023-06-01' existing = if (!const_newVnet) { +resource existingVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { name: name_vnet scope: resourceGroup(vnetForApplicationGateway.resourceGroup) } // Get existing subnet. -resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@2023-06-01' existing = if (!const_newVnet) { +resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { name: name_subnet parent: existingVnet } // Create new network security group. -resource nsg 'Microsoft.Network/networkSecurityGroups@2023-06-01' = if (const_newVnet) { +resource nsg 'Microsoft.Network/networkSecurityGroups@${azure.apiVersionForNetworkSecurityGroups}' = if (const_newVnet) { name: nsgName location: location - tags: tagsByResource['Microsoft.Network/networkSecurityGroups'] + tags: tagsByResource['${identifier.networkSecurityGroups}'] properties: { securityRules: [ { @@ -82,10 +82,10 @@ resource nsg 'Microsoft.Network/networkSecurityGroups@2023-06-01' = if (const_ne } // Create new VNET and subnet. -resource newVnet 'Microsoft.Network/virtualNetworks@2023-06-01' = if (const_newVnet) { +resource newVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' = if (const_newVnet) { name: name_vnet location: location - tags: tagsByResource['Microsoft.Network/virtualNetworks'] + tags: tagsByResource['${identifier.virtualNetworks}'] properties: { addressSpace: { addressPrefixes: const_vnetAddressPrefixes diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep index a4338eb17..901fe4f83 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep @@ -35,7 +35,7 @@ param useInternalLB bool = false param utcValue string = utcNow() param wlsDomainName string = 'domain1' param wlsDomainUID string = 'sample-domain1' -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object var const_commonScript = 'common.sh' @@ -46,12 +46,12 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_primaryScript = 'setupNetworking.sh' var const_utilityScript = 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-networking-deployment-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep index a2d16bba3..4b198a7f8 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep @@ -31,7 +31,7 @@ param managedServerPrefix string = 'managed-server' param ocrSSOPSW string param ocrSSOUser string param storageAccountName string = 'null' -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 @@ -83,12 +83,12 @@ var const_setUpDomainScript = 'setupWLSDomain.sh' var const_updateDomainConfigScript= 'updateDomainConfig.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-cluster-creation-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ @@ -174,7 +174,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { } { name: 'TAG_VM' - value: string(tagsByResource['Microsoft.Compute/virtualMachines']) + value: string(tagsByResource['${identifier.virtualMachines}']) } { name: 'URL_3RD_DATASOURCE' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep index c47e77f5e..301d0c399 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep @@ -22,7 +22,7 @@ param enablePswlessConnection bool = false param identity object = {} param jdbcDataSourceName string param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -38,12 +38,12 @@ var const_dbUtilityScript='dbUtility.sh' var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-db-connection-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep index e65e34621..d86fc1353 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep @@ -7,7 +7,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsClusterName string = 'cluster-1' @@ -18,12 +18,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryDomainConfigurations = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryDomainConfigurations.sh') var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-query-wls-configurations-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep index 63e6b19fa..6cf54e5cc 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep @@ -11,7 +11,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -27,12 +27,12 @@ var const_utilityScript= 'utility.sh' var const_commonScript= 'common.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-validate-applications-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep index fde517ae3..6b121526a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep @@ -42,7 +42,7 @@ param sslUploadedCustomTrustKeyStoreType string param sslUploadedPrivateKeyAlias string @secure() param sslUploadedPrivateKeyPassPhrase string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param useAksWellTestedVersion bool = true param userProvidedAcr string @@ -61,12 +61,12 @@ var const_arguments = '${location} ${createAKSCluster} ${aksAgentPoolVMSize} ${a var const_checkDNSZone = enableDNSConfiguration && !createDNSZone var const_deploymentName = 'ds-validate-parameters-and-fail-fast-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion arguments: const_arguments diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep index 327013c65..ec3571b0f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep @@ -12,7 +12,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param utilizationPercentage int @@ -25,12 +25,12 @@ var base64_enableHpa = loadFileAsBase64('../../../arm/scripts/inline-scripts/ena var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-enable-hpa-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep index 75032eed7..e9e29f633 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep @@ -9,7 +9,7 @@ param azCliVersion string param identity object = {} param kedaUamiName string param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -28,12 +28,12 @@ var const_deploymentName = 'ds-enable-promethues-metrics-${_globalResourceNameSu var const_kedaNamespace= 'keda' var const_kedaSa= 'keda-operator' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}', base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep index 8a84a0818..e42042a66 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep @@ -15,7 +15,7 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep index b5f9c1d69..fc355f699 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep @@ -8,7 +8,7 @@ param appgwName string = 'appgw-contoso' param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -18,12 +18,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-install-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep index 0264ccd74..ea3ad9025 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep @@ -7,7 +7,7 @@ param knownIP string = '10.0.0.1' param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -16,12 +16,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryPrivateIPForAppGateway = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryPrivateIPForAppGateway.sh') var const_deploymentName = 'ds-query-private-ip-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}', base64ToString(base64_common), base64ToString(base64_queryPrivateIPForAppGateway)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep index 10ae1768f..edb36e12c 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep @@ -35,7 +35,7 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_updateAppScript= 'updateApplications.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-update-applications-${uniqueString(utcValue)}' location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep index 08101e281..437ac0128 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep @@ -7,7 +7,7 @@ param aksClusterRGName string param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -17,12 +17,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/va var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep index e94bb5bf2..59d78778a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep @@ -21,7 +21,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param useHpa bool param utilizationPercentage int diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep index ef5efa967..fc5aa1a2e 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep @@ -8,7 +8,7 @@ param aksClusterRGName string param azCliVersion string param identity object = {} param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -24,32 +24,32 @@ var name_azureMonitorAccountName = 'ama${_globalResourceNameSuffix}' var name_kedaUserDefinedManagedIdentity = 'kedauami${_globalResourceNameSuffix}' var name_kedaMonitorDataReaderRoleAssignmentName = guid('${resourceGroup().id}${name_kedaUserDefinedManagedIdentity}${_globalResourceNameSuffix}') -resource monitorAccount 'Microsoft.Monitor/accounts@2023-04-03' = { +resource monitorAccount 'Microsoft.Monitor/accounts@${azure.apiVersionForMonitorAccount}' = { name: name_azureMonitorAccountName location: location properties: {} - tags: tagsByResource['Microsoft.Monitor/accounts'] + tags: tagsByResource['${identifier.accounts}'] } // UAMI for KEDA -resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { +resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { name: name_kedaUserDefinedManagedIdentity location: location - tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] + tags: tagsByResource['${identifier.userAssignedIdentities}'] } // Get role resource id -resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: const_roleDefinitionIdOfMonitorDataReader } // Assign Monitor Data Reader role we need the permission to read data. -resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_kedaMonitorDataReaderRoleAssignmentName scope: monitorAccount properties: { description: 'Assign Monitor Data Reader role role to KEDA Identity ' - principalId: reference(uamiForKeda.id, '2023-01-31', 'full').properties.principalId + principalId: reference(uamiForKeda.id, '${azure.apiVersionForIdentity}', 'full').properties.principalId principalType: 'ServicePrincipal' roleDefinitionId: monitorDataReaderResourceDefinition.id } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep index b27976c15..e5acfe269 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep @@ -5,7 +5,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param _globalResourceNameSuffix string param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param name_deploymentScriptContributorRoleAssignmentName string = newGuid() @@ -14,10 +14,10 @@ var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' var name_deploymentScriptUserDefinedManagedIdentity = 'wls-aks-deployment-script-user-defined-managed-itentity-${_globalResourceNameSuffix}' // UAMI for deployment script -resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { +resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { name: name_deploymentScriptUserDefinedManagedIdentity location: location - tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] + tags: tagsByResource['${identifier.userAssignedIdentities}'] } // Assign Contributor role in subscription scope, we need the permission to get/update resource cross resource group. diff --git a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep index d8439896a..0790d55a1 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep @@ -6,7 +6,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param acrName string = 'acr-contoso' param acrResourceGroupName string = 'acr-contoso-rg' param createNewAcr bool = false -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param location string diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep index 1f8666c37..e2bc8bed0 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfVnetContributor = '4d97b98b-1d4f-4787-a291-c67834d212e7' -resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Network Contributor role to AGIC Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep index 5b8fa06a6..85f56df12 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' -resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Resource Group Contributor role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep index 5aaad7ff0..514d47094 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep @@ -10,17 +10,17 @@ param dbIdentityName string = '' var const_roleDefinitionIdOfManagedIdentityOperator = 'f1a07417-d97a-45cb-824c-7a7467783830' var name_roleAssignmentName = guid('${subscription().id}${clusterIdentityPrincipalId}Role assignment in resource scope') -resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = { +resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' existing = { name: dbIdentityName } // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: const_roleDefinitionIdOfManagedIdentityOperator } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_roleAssignmentName scope: dbIdentityResource properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep index ec44876f3..f5b50c20d 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep @@ -25,12 +25,12 @@ var const_identityAPIVersion = '2022-01-31-PREVIEW' var name_roleAssignmentName = guid('${subscription().id}${_globalResourceNameSuffix}Role assignment in resource group scope') // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_roleAssignmentName properties: { description: 'Assign resource group scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep index c886338c6..9c27fb507 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep @@ -25,12 +25,12 @@ param principalId string = '' var name_roleAssignmentName = guid('${subscription().id}${principalId}Role assignment in subscription scope') // Get role resource id in subscription -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_roleAssignmentName properties: { description: 'Assign subscription scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep index 6cac83700..fb2a44eed 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep @@ -41,7 +41,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object @description('UID of WebLogic domain, used in WebLogic Operator.') param wlsDomainUID string = 'sample-domain1' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep index 1218706de..3b88c7872 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep @@ -35,7 +35,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @description('UID of WebLogic domain, used in WebLogic Operator.') @@ -93,7 +93,7 @@ module dbIdentityVMContributorRoleAssignment '_rolesAssignment/_roleAssignmentin } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } diff --git a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep index a1cab35be..47374ba3f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep @@ -49,7 +49,7 @@ param location string param lbSvcValues array = [] param newOrExistingVnetForApplicationGateway string param vnetRGNameForApplicationGateway string -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object @description('True to set up internal load balancer service.') param useInternalLB bool = false diff --git a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep index 5ffc7c2b0..47666bdee 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep @@ -84,7 +84,7 @@ param ocrSSOUser string param storageAccountName string = 'stg-contoso' param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 -@description('Tags for the resources.') +@description('${label.tagsLabel}') param tagsByResource object param userProvidedAcr string = 'null' param userProvidedAcrRgName string = 'null' @@ -149,7 +149,7 @@ module pidSSLStart './_pids/_pid.bicep' = if (enableCustomSSL) { } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = if (!createAKSCluster) { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = if (!createAKSCluster) { name: aksClusterName scope: resourceGroup(aksClusterRGName) } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json index 5abdc5abb..77f835f0b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json @@ -92,7 +92,7 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "${post.deploy.ssl.config.start}", "properties": { "mode": "Incremental", @@ -106,7 +106,7 @@ { "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "location": "[parameters('location')]", "properties": { "publisher": "Microsoft.Azure.Extensions", @@ -126,7 +126,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "${post.deploy.ssl.config.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json index d75861ed1..0b231770b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json @@ -94,7 +94,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" + ${azure.armBased.vmSize.list} ] }, "osPlatform": "Linux", @@ -1020,18 +1020,18 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "Microsoft.Network/dnszones", - "Microsoft.Network/networkInterfaces", - "Microsoft.Network/networkSecurityGroups", - "Microsoft.Network/publicIPAddresses", - "Microsoft.Network/privateEndpoints", - "Microsoft.Storage/storageAccounts", - "Microsoft.Network/virtualNetworks", - "Microsoft.Compute/virtualMachines", - "Virtual machine extension", - "Microsoft.Resources/deploymentScripts", - "Microsoft.ManagedIdentity/userAssignedIdentities", - "Microsoft resources deployment" + "${identifier.dnszones}", + "${identifier.networkInterfaces}", + "${identifier.networkSecurityGroups}", + "${identifier.publicIPAddresses}", + "${identifier.privateEndpoints}", + "${identifier.storageAccounts}", + "${identifier.virtualNetworks}", + "${identifier.virtualMachines}", + "${identifier.virtualMachinesExtensions}", + "${identifier.deploymentScripts}", + "${identifier.userAssignedIdentities}", + "${identifier.resourcesDeployment}" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json index 14ce7f3ca..0775fbd38 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json @@ -346,7 +346,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsDomainName": { @@ -387,18 +387,18 @@ // If adding a new resource, add the resource identifier to the array below // Also modify createUIDefinition.json to include the new resource "obj_tagsByResources":{ - "Microsoft.Network/dnszones": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/dnszones')]", - "Microsoft.Network/networkInterfaces": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces')]", - "Microsoft.Network/networkSecurityGroups": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkSecurityGroups')]", - "Microsoft.Network/publicIPAddresses": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses')]", - "Microsoft.Network/privateEndpoints": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/privateEndpoints')]", - "Microsoft.Storage/storageAccounts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts')]", - "Microsoft.Network/virtualNetworks": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks')]", - "Microsoft.Compute/virtualMachines": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/virtualMachines')]", - "Virtual machine extension": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Virtual machine extension')]", - "Microsoft.Resources/deploymentScripts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Resources/deploymentScripts')]", - "Microsoft.ManagedIdentity/userAssignedIdentities": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.ManagedIdentity/userAssignedIdentities')]", - "Microsoft resources deployment": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft resources deployment')]" + "${identifier.dnszones}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.dnszones}')]", + "${identifier.networkInterfaces}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkInterfaces}')]", + "${identifier.networkSecurityGroups}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkSecurityGroups}')]", + "${identifier.publicIPAddresses}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.publicIPAddresses}')]", + "${identifier.privateEndpoints}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.privateEndpoints}')]", + "${identifier.storageAccounts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.storageAccounts}')]", + "${identifier.virtualNetworks}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualNetworks}')]", + "${identifier.virtualMachines}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]", + "${identifier.virtualMachinesExtensions}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachinesExtensions}')]", + "${identifier.deploymentScripts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.deploymentScripts}')]", + "${identifier.userAssignedIdentities}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.userAssignedIdentities}')]", + "${identifier.resourcesDeployment}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.resourcesDeployment}')]" } }, "functions": [ @@ -429,9 +429,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", - "name": "pid-7e52c2b6-1acb-416f-af55-5837ff783eb7-partnercenter", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "name": "${admin.start}", "properties": { "mode": "Incremental", "template": { @@ -445,8 +445,8 @@ { "name": "adminLinkedTemplate", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", - "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[not(parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -548,8 +548,8 @@ { "name": "adminCustomSSLLinkedTemplate", "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "condition": "[parameters('enableCustomSSL')]", "properties": { "mode": "Incremental", @@ -677,8 +677,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "networkSecurityLinkedTemplate", "properties": { @@ -703,9 +703,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "dnszonesLinkedTemplate", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "condition": "[and(parameters('enableCustomDNS'), equals(parameters('virtualNetworkNewOrExisting'), 'new'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]" @@ -745,7 +745,7 @@ }, "targetResources": { "value": [ - "[reference(variables('name_adminLinkedTemplateDeployment'), '2023-07-01').outputs._adminPublicIPId.value]" + "[reference(variables('name_adminLinkedTemplateDeployment'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value]" ] }, "tagsByResource": { @@ -760,8 +760,8 @@ "[resourceId('Microsoft.Resources/deployments', 'dnszonesLinkedTemplate')]" ], "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", - "apiVersion": "2023-07-01", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[parameters('enableDB')]", "properties": { "mode": "Incremental", @@ -824,10 +824,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_uamiForPostDeploymentScript')]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('name_adminLinkedTemplateDeployment'))]", "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]", @@ -855,10 +855,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "postDeplyment", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('name_adminLinkedTemplateDeployment'))]", "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]", @@ -892,16 +892,16 @@ "value": "[parameters('_artifactsLocationSasToken')]" }, "userAssignedIdentityResourceId":{ - "value": "[reference(variables('name_uamiForPostDeploymentScript'),'2023-07-01').outputs.uamidForPostDeployment.value]" + "value": "[reference(variables('name_uamiForPostDeploymentScript'),'${azure.apiVersionForDeployment}').outputs.uamidForPostDeployment.value]" } } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", - "name": "057f09cd-6f90-5c1c-b655-3aba168aef35", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", + "name": "${admin.end}", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('name_adminLinkedTemplateDeployment'))]", "[resourceId('Microsoft.Resources/deployments', 'networkSecurityLinkedTemplate')]", @@ -928,36 +928,36 @@ }, "hostname": { "type": "string", - "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.hostname.value]" + "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.hostname.value]" }, "sshCommand": { "type": "string", - "value": "[concat('ssh ', parameters('adminUsername'), '@', reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.hostname.value)]" + "value": "[concat('ssh ', parameters('adminUsername'), '@', reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.hostname.value)]" }, "wlsDomainLocation": { "type": "string", - "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.wlsDomainLocation.value]" + "value": "[reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.wlsDomainLocation.value]" }, "adminConsoleURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminConsoleURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminConsoleURL.value)]" }, "adminConsoleSecureURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminConsoleSecureURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminConsoleSecureURL.value)]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminRemoteConsoleURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]" }, "adminRemoteConsoleSecureURL": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'2023-07-01').outputs.adminRemoteConsoleSecureURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecureURL.value)]" }, "dnsZoneNameServers": { "type": "array", "condition": "[and(parameters('enableCustomDNS'), not(parameters('hasDNSZones')))]", - "value": "[reference('dnszonesLinkedTemplate','2023-07-01').outputs.dnsZoneNameServers.value]" + "value": "[reference('dnszonesLinkedTemplate','${azure.apiVersionForDeployment}').outputs.dnsZoneNameServers.value]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json index 0740e950e..ba47748a4 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json @@ -17,7 +17,7 @@ }, "resources": [ { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('vmName')]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json index eea5faaca..f88e4117d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json @@ -85,7 +85,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsPassword": { @@ -113,9 +113,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "6b253477-1753-5eb1-9448-506ab47494d7", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${admin.database.start}", "properties": { "mode": "Incremental", "template": { @@ -127,11 +127,11 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "properties": { "publisher": "Microsoft.Azure.Extensions", "type": "CustomScript", @@ -152,9 +152,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "e4549cf7-1f1e-5add-a543-0dfcc627976b", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${admin.database.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -170,9 +170,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "692b2d84-72f5-5992-a15d-0d5bcfef040d", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.oracle}", "condition": "[if(contains(parameters('databaseType'), 'oracle'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -189,9 +189,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "935df06e-a5d5-5bf1-af66-4c1eb71dac7a", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.postgresql}", "condition": "[if(contains(parameters('databaseType'), 'postgresql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -208,9 +208,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "3569588c-b89d-5567-84ee-a2c633c7204c", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.sqlserver}", "condition": "[if(contains(parameters('databaseType'), 'sqlserver'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -227,9 +227,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "41c353ae-6f7b-442f-b903-996cb42c1bbe", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.mysql}", "condition": "[if(contains(parameters('databaseType'), 'mysql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json index 7d1541cbb..52164197b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json @@ -42,7 +42,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "ttl": { @@ -67,9 +67,9 @@ "resources": [ { "type": "Microsoft.Network/dnszones", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "name": "[parameters('dnszoneName')]", - "tags": "[parameters('tagsByResource')['Microsoft.Network/dnszones']]", + "tags": "[parameters('tagsByResource')['${identifier.dnszones}']]", "location": "[parameters('location')]", "properties": { "zoneType": "Public" @@ -77,7 +77,7 @@ }, { "type": "Microsoft.Network/dnszones/A", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "condition": "[variables('const_hasARecords')]", "name": "[concat(parameters('dnszoneName'), '/', variables('const_dnszonesARecordSetNames')[copyIndex()])]", "copy": { @@ -96,7 +96,7 @@ }, { "type": "Microsoft.Network/dnszones/CNAME", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "condition": "[variables('const_hasCNAMERecords')]", "name": "[concat(parameters('dnszoneName'),'/', variables('const_dnszonesCNAMERecordSetNames')[copyIndex()])]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json index dae1db61d..766dd3089 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json @@ -15,7 +15,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } } }, @@ -27,16 +27,16 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "2023-01-31", + "apiVersion": "${azure.apiVersionForIdentity}", "name": "[parameters('uamiName')]", "location": "[parameters('location')]", - "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]" + "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_deploymentScriptContributorRoleAssignmentName')]", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "subscriptionId": "[subscription().subscriptionId]", "location": "[parameters('location')]", "properties": { @@ -79,7 +79,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2022-04-01", + "apiVersion": "${azure.apiVersionForRoleAssignment}", "name": "[variables('name_roleAssignmentName')]", "properties": { "description": "Assign subscription scope role to User Assigned Managed Identity ", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json index bb2f80929..4794a5891 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json @@ -74,7 +74,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "ttl": { @@ -120,8 +120,8 @@ { "type": "Microsoft.Resources/deployments", "name": "uamiDeployment", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "templateLink": { @@ -146,8 +146,8 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", - "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", + "apiVersion": "${azure.apiVersionForDeploymentScript}", + "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'uamiDeployment')]" ], @@ -162,7 +162,7 @@ "kind": "AzureCLI", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "AzCliVersion": "2.53.0", + "AzCliVersion": "${azure.cli.version}", "timeout": "PT30M", "environmentVariables": [ { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json index d75709ded..381354058 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json @@ -53,7 +53,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsDomainName": { @@ -84,10 +84,10 @@ }, "resources": [ { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'), '/newuserscript')]", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "location": "[parameters('location')]", "properties": { "publisher": "Microsoft.Azure.Extensions", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json index b2a8dc7c7..b73945dfe 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json @@ -74,7 +74,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsDomainName": { @@ -99,7 +99,7 @@ }, "variables": { "const_connectionString": "[if(and(equals(parameters('databaseType'),'sqlserver'), equals(last(parameters('dsConnectionURL')),';')), take(parameters('dsConnectionURL'), add(length(parameters('dsConnectionURL')),-1)),parameters('dsConnectionURL'))]", - "const_identityAPIVersion": "2023-01-31", + "const_identityAPIVersion": "${azure.apiVersionForIdentity}", "const_msiDefaultUser": "msiUser", "name_appendIdentityTemplate": "_appendUserManagedIdentity.json", "name_installJdbcLibsTemplate": "_installJdbcLibsTemplate.json", @@ -132,9 +132,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "53e099bf-8148-5463-a51d-0272520bac60", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${admin.pswless.database.start}", "properties": { "mode": "Incremental", "template": { @@ -146,8 +146,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "assignDbIdentityToAdminVM", "properties": { "mode": "Incremental", @@ -163,7 +163,7 @@ "value": "[variables('obj_dbIdentity')]" }, "existingIdentities": { - "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '2024-11-01', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '2024-11-01', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" + "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '${azure.apiVersionForVirtualMachines}', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',parameters('adminVMName')), '${azure.apiVersionForVirtualMachines}', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" }, "location": { "value": "[parameters('location')]" @@ -173,8 +173,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "installJdbcLibsTemplate", "condition": "[or(equals(parameters('databaseType'),'mysql'), equals(parameters('databaseType'),'postgresql'))]", "dependsOn": [ @@ -222,8 +222,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "passwordlessDatasourceDeployment", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'installJdbcLibsTemplate')]" @@ -279,9 +279,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "89d5d2a9-16b8-5b3d-b5f7-1fb8a6cfdfc5", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${admin.pswless.database.end}", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'passwordlessDatasourceDeployment')]" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json index 7930418ec..f415721a6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json @@ -226,7 +226,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } } }, @@ -278,9 +278,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "47c1a398-7527-53f0-abc7-13a206844885", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${admin.admin.start}", "properties": { "mode": "Incremental", "template": { @@ -293,8 +293,8 @@ }, { "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2023-06-01", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -344,8 +344,8 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2025-01-01", - "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", + "apiVersion": "${azure.apiVersionForStorage}", + "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -360,10 +360,10 @@ ] }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPrivateEndpoint}", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", + "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -387,7 +387,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -399,7 +399,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -410,9 +410,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", "name": "[variables('name_publicIPAddress')]", "location": "[parameters('location')]", "properties": { @@ -423,9 +423,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -450,9 +450,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_nic_with_pub_ip')]", "location": "[parameters('location')]", @@ -481,9 +481,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[variables('name_nic_without_pub_ip')]", "location": "[parameters('location')]", @@ -509,9 +509,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", "name": "[parameters('adminVMName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -554,7 +554,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -566,9 +566,9 @@ }, { "name": "[concat(parameters('adminVMName'),'/newuserscript')]", - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "location": "[parameters('location')]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', parameters('adminVMName'))]", @@ -590,15 +590,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'), '\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'), '\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "1176aa69-c0c4-5651-8c66-25cbfd8de483", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${admin.admin.end}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -614,9 +614,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk21-ol94}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -633,9 +633,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk21-ol810}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -652,9 +652,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk17-ol94}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -671,9 +671,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "69b6b433-1679-4d37-af25-3d56987c217a", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk17-ol810}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -690,9 +690,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "cd48f178-52a3-415e-88bb-caa45f615b94", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol91}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -709,9 +709,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -728,9 +728,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol91}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -747,9 +747,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -766,9 +766,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol91}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -785,9 +785,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -804,9 +804,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -823,9 +823,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -842,9 +842,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json index 9aba9219d..695281585 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json @@ -258,7 +258,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "vmSize": { @@ -334,10 +334,10 @@ }, "resources": [ { - "apiVersion": "2023-07-01", - "name": "47c1a398-7527-53f0-abc7-13a206844885", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${admin.admin.start}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "template": { @@ -349,10 +349,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "2730ced3-52c2-501c-94b1-bfcffa5b5bc0", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${admin.ssl.start}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "template": { @@ -364,9 +364,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "type": "Microsoft.Network/networkSecurityGroups", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", + "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -416,9 +416,9 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorage}", "name": "[variables('name_storageAccount')]", - "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", + "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", "location": "[parameters('location')]", "sku": { "name": "[variables('const_storageAccountType')]" @@ -432,10 +432,10 @@ ] }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPrivateEndpoint}", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", + "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -459,7 +459,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -471,7 +471,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -482,9 +482,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", "name": "[variables('name_publicIPAddress')]", "location": "[parameters('location')]", "properties": { @@ -495,9 +495,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -522,9 +522,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_nic_with_pub_ip')]", "location": "[parameters('location')]", @@ -553,9 +553,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[variables('name_nic_without_pub_ip')]", "location": "[parameters('location')]", @@ -581,9 +581,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", "name": "[parameters('adminVMName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -625,7 +625,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -636,9 +636,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", "dependsOn": [ @@ -661,14 +661,14 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'),' ',string(parameters('enableCustomSSL')),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyAlias')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyPassPhrase')),''), '\"')]" } + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',variables('name_share'),' ',string(parameters('enableCustomSSL')),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomIdentityKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslCustomTrustKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyAlias')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('sslPrivateKeyPassPhrase')),''), '\"')]" } } }, { - "apiVersion": "2023-07-01", - "name": "7185f788-ab74-5158-8f83-4146d01cec9d", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${admin.ssl.end}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -683,10 +683,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "1176aa69-c0c4-5651-8c66-25cbfd8de483", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${admin.admin.end}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -702,9 +702,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk21-ol94}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -721,9 +721,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk21-ol810}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -740,9 +740,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk17-ol94}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -759,9 +759,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "69b6b433-1679-4d37-af25-3d56987c217a", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk17-ol810}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -778,9 +778,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "cd48f178-52a3-415e-88bb-caa45f615b94", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol91}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -797,9 +797,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -816,9 +816,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol91}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -835,9 +835,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -854,9 +854,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol91}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -873,9 +873,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -892,9 +892,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -911,9 +911,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -930,9 +930,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel87}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json index 98ec095ae..10d56c67c 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json @@ -88,7 +88,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsDomainName": { @@ -119,8 +119,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "pswlessDbTemplate", "condition": "[parameters('enablePswlessConnection')]", "properties": { @@ -177,8 +177,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "upgradeMySQLJdbcDriverTemplate", "condition": "[and(not(parameters('enablePswlessConnection')), equals(parameters('databaseType'),'mysql'))]", "properties": { @@ -223,9 +223,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "passwordDatasourceDeployment", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[not(parameters('enablePswlessConnection'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'upgradeMySQLJdbcDriverTemplate')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json index 14e528b71..a850bc0a0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json @@ -87,7 +87,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "ttl": { @@ -112,10 +112,10 @@ }, "resources": [ { - "apiVersion": "2023-07-01", - "name": "c40d7aa8-9fe7-51c6-86de-27e1b1678735", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.dns.start}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "template": { @@ -126,9 +126,9 @@ } }, { - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "createDNSZone", "condition": "[not(parameters('hasDNSZones'))]", "properties": { @@ -166,9 +166,9 @@ } }, { - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "updateDNSZone", "condition": "[parameters('hasDNSZones')]", "properties": { @@ -221,10 +221,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "022d99e3-8ba3-5822-b6d5-bcec64518286", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.dns.end}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "template": { @@ -239,7 +239,7 @@ "dnsZoneNameServers": { "type": "array", "condition": "[not(parameters('hasDNSZones'))]", - "value": "[reference('createDNSZone', '2023-07-01').outputs.dnsZoneNameServers.value]" + "value": "[reference('createDNSZone', '${azure.apiVersionForDeployment}').outputs.dnsZoneNameServers.value]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json index 9e10f049d..a2ec4c154 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json @@ -18,7 +18,7 @@ }, "resources": [ { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsAllowed')]", "condition": "[not(parameters('denyPublicTrafficForAdminServer'))]", @@ -37,7 +37,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsDenied')]", "condition": "[parameters('denyPublicTrafficForAdminServer')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json index e8f98fedb..22eca42b8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "const_guidTag" :{ @@ -63,8 +63,8 @@ "resources": [ { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", - "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", + "apiVersion": "${azure.apiVersionForDeploymentScript}", + "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", "name": "[concat('postdeployscript-', parameters('_globalResourceNameSuffix'))]", "kind": "AzureCLI", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json index fcbdf9585..c3b66f099 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "roleAssignmentNameSeed": { @@ -37,14 +37,14 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "2023-01-31", - "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", + "apiVersion": "${azure.apiVersionForIdentity}", + "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", "name": "[variables('name_postDeploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_postDeploymentScriptRoleAssignment')]", "location": "[parameters('location')]", "subscriptionId": "[subscription().subscriptionId]", @@ -76,7 +76,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2022-04-01", + "apiVersion": "${azure.apiVersionForRoleAssignment}", "name": "[variables('roleAssignmentGuid')]", "properties": { "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', parameters('innerRoleDefinitionId'))]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json index ae00e224e..c3febcf13 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json @@ -286,8 +286,8 @@ ], "resources": [ { - "apiVersion": "2023-07-01", - "name": "157ea992-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.addnode.coherence.start}", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -300,7 +300,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_cacheServerIndexOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -316,13 +316,13 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -354,7 +354,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')))]", "location": "[parameters('location')]", @@ -399,7 +399,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -410,7 +410,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')),'/newuserscript')]", "location": "[parameters('location')]", @@ -437,13 +437,13 @@ ] }, "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')), '2025-01-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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','True',' ',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_scriptCoherenceFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','True',' ',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'),'\"')]" } } }, { - "apiVersion": "2023-07-01", - "name": "157ea8ac-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.addnode.coherence.end}", "type": "Microsoft.Resources/deployments", "dependsOn": [ "virtualMachineExtensionLoop" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json index 9c61123e0..be5a0898e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json @@ -339,8 +339,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "ffa02caf-ecb9-59df-82ce-74b9b0247c50", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.addnode.start}", "properties": { "mode": "Incremental", "template": { @@ -351,7 +351,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -367,13 +367,13 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -405,7 +405,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')))]", "location": "[parameters('location')]", @@ -453,7 +453,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -465,7 +465,7 @@ }, { "type": "Microsoft.Network/applicationGateways", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForApplicationGateways}", "condition": "[parameters('appGatewaySettings').enable]", "name": "[variables('name_appGateway')]", "location": "[parameters('location')]", @@ -657,7 +657,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')), '/newuserscript')]", "location": "[parameters('location')]", @@ -685,13 +685,13 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ', copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-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'),' ',if(parameters('appGatewaySettings').enable, reference(resourceId('Microsoft.Network/publicIPAddresses', parameters('appGatewaySettings').publicIPName),'2023-06-01').dnsSettings.fqdn, 'null'), ' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ', parameters('enableCoherence'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').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'),' ',if(parameters('appGatewaySettings').enable, reference(resourceId('Microsoft.Network/publicIPAddresses', parameters('appGatewaySettings').publicIPName),'${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, 'null'), ' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ', parameters('enableCoherence'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2452bb0e-13d9-5ad3-816b-d645ba5198c4", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.addnode.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json index 4a464b6bf..3b5d25087 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json @@ -94,7 +94,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" + ${azure.armBased.vmSize.list} ] }, "osPlatform": "Linux", @@ -1405,21 +1405,21 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "Microsoft.Network/applicationGateways", - "Microsoft.Compute/virtualMachines", - "Virtual machine extension", - "Microsoft.Network/publicIPAddresses", - "Microsoft.Compute/availabilitySets", - "Microsoft.KeyVault/vaults", - "Microsoft.ManagedIdentity/userAssignedIdentities", - "Microsoft.Network/dnszones", - "Microsoft.Network/networkInterfaces", - "Microsoft.Network/networkSecurityGroups", - "Microsoft.Network/privateEndpoints", - "Microsoft.Network/virtualNetworks", - "Microsoft.Resources/deploymentScripts", - "Microsoft.Storage/storageAccounts", - "Microsoft resources deployment" + "${identifier.applicationGateways}", + "${identifier.virtualMachines}", + "${identifier.virtualMachinesExtensions}", + "${identifier.publicIPAddresses}", + "${identifier.availabilitySets}", + "${identifier.vaults}", + "${identifier.userAssignedIdentities}", + "${identifier.dnszones}", + "${identifier.networkInterfaces}", + "${identifier.networkSecurityGroups}", + "${identifier.privateEndpoints}", + "${identifier.virtualNetworks}", + "${identifier.deploymentScripts}", + "${identifier.storageAccounts}", + "${identifier.resourcesDeployment}" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json index 788f61ddc..32cf58e1b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json @@ -321,7 +321,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "usePreviewImage": { @@ -536,21 +536,21 @@ // If adding a new resource, add the resource identifier to the array below // Also modify createUIDefinition.json to include the new resource "obj_tagsByResources": { - "Microsoft.Network/applicationGateways": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/applicationGateways')]", - "Microsoft.Compute/availabilitySets": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/availabilitySets')]", - "Microsoft.Network/dnszones": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/dnszones')]", - "Microsoft.Network/networkInterfaces": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces')]", - "Microsoft.Network/networkSecurityGroups": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkSecurityGroups')]", - "Microsoft.Network/publicIPAddresses": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses')]", - "Microsoft.Network/privateEndpoints": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/privateEndpoints')]", - "Microsoft.Storage/storageAccounts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts')]", - "Microsoft.KeyVault/vaults": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.KeyVault/vaults')]", - "Microsoft.Network/virtualNetworks": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks')]", - "Microsoft.Compute/virtualMachines": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/virtualMachines')]", - "Virtual machine extension": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Virtual machine extension')]", - "Microsoft.Resources/deploymentScripts": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Resources/deploymentScripts')]", - "Microsoft.ManagedIdentity/userAssignedIdentities": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.ManagedIdentity/userAssignedIdentities')]", - "Microsoft resources deployment": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft resources deployment')]" + "${identifier.applicationGateways}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.applicationGateways}')]", + "${identifier.availabilitySets}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.availabilitySets}')]", + "${identifier.dnszones}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.dnszones}')]", + "${identifier.networkInterfaces}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkInterfaces}')]", + "${identifier.networkSecurityGroups}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkSecurityGroups}')]", + "${identifier.publicIPAddresses}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.publicIPAddresses}')]", + "${identifier.privateEndpoints}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.privateEndpoints}')]", + "${identifier.storageAccounts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.storageAccounts}')]", + "${identifier.vaults}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.vaults}')]", + "${identifier.virtualNetworks}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualNetworks}')]", + "${identifier.virtualMachines}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]", + "${identifier.virtualMachinesExtensions}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachinesExtensions}')]", + "${identifier.deploymentScripts}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.deploymentScripts}')]", + "${identifier.userAssignedIdentities}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.userAssignedIdentities}')]", + "${identifier.resourcesDeployment}": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.resourcesDeployment}')]" } }, "functions": [ @@ -580,10 +580,10 @@ ], "resources": [ { - "apiVersion": "2023-07-01", - "name": "pid-7363cd91-937d-4469-a7a8-ecbeddfb7a0f-partnercenter", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.start}", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "template": { @@ -595,9 +595,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_clusterTemplate')]", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "condition": "[not(parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -719,8 +719,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "name": "[variables('name_clusterCustomSSLTemplate')]", "condition": "[parameters('enableCustomSSL')]", "properties": { @@ -870,8 +870,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "name": "keyVaultwithSelfSignedAppGatewaySSLCert", "condition": "[and(parameters('enableAppGateway'), equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')))]", "dependsOn": [ @@ -910,8 +910,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "networkSecurityLinkedTemplate", "properties": { @@ -941,8 +941,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "name": "appGatewayLinkedTemplate", "condition": "[parameters('enableAppGateway')]", "properties": { @@ -971,10 +971,10 @@ "value": "[parameters('appGatewaySSLBackendCertData')]" }, "autoGeneratedSSLCertKeyVaultName": { - "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '2023-07-01').outputs.keyvaultName.value, '')]" + "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '${azure.apiVersionForDeployment}').outputs.keyvaultName.value, '')]" }, "autoGeneratedSSLCertSecretName": { - "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '2023-07-01').outputs.secretName.value, '')]" + "value": "[if(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')), reference('keyVaultwithSelfSignedAppGatewaySSLCert', '${azure.apiVersionForDeployment}').outputs.secretName.value, '')]" }, "customDomainNameforApplicationGateway": { "value": "[format('{0}.{1}', parameters('dnszoneAppGatewayLabel'), parameters('dnszoneName'))]" @@ -1042,8 +1042,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "name": "dnszonesLinkedTemplate", "condition": "[parameters('enableDNSConfiguration')]", "dependsOn": [ @@ -1071,7 +1071,7 @@ ] }, "dnszonesCNAMEAlias": { - "value": "[if(parameters('enableAppGateway'), createArray(reference('appGatewayLinkedTemplate', '2023-07-01').outputs.appGatewayAlias.value), createArray())]" + "value": "[if(parameters('enableAppGateway'), createArray(reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayAlias.value), createArray())]" }, "dnszonesCNAMERecordSetNames": { "value": "[if(parameters('enableAppGateway'), createArray(parameters('dnszoneAppGatewayLabel')), createArray())]" @@ -1090,7 +1090,7 @@ }, "targetResources": { "value": [ - "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs._adminPublicIPId.value]" + "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value]" ] }, "tagsByResource": { @@ -1101,8 +1101,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "name": "dbLinkedTemplate", "condition": "[parameters('enableDB')]", "dependsOn": [ @@ -1178,11 +1178,11 @@ { "name": "coherenceTemplate", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[and(parameters('enableCoherence'),not(parameters('enableCustomSSL')))]", "properties": { "mode": "Incremental", @@ -1237,7 +1237,7 @@ "value": "[parameters('skuUrnVersion')]" }, "storageAccountName": { - "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.storageAccountName.value]" + "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" }, "subnetName": { "value": "[parameters('subnetName')]" @@ -1281,11 +1281,11 @@ { "name": "coherenceTemplateWithCustomSSL", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[and(parameters('enableCoherence'),parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -1340,7 +1340,7 @@ "value": "[parameters('skuUrnVersion')]" }, "storageAccountName": { - "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.storageAccountName.value]" + "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" }, "subnetName": { "value": "[parameters('subnetName')]" @@ -1407,10 +1407,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_uamiForPostDeploymentScript')]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('clusterTemplateRef'))]", "[resourceId('Microsoft.Resources/deployments', 'keyVaultwithSelfSignedAppGatewaySSLCert')]", @@ -1441,10 +1441,10 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "postDeplyment", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('clusterTemplateRef'))]", "[resourceId('Microsoft.Resources/deployments', 'keyVaultwithSelfSignedAppGatewaySSLCert')]", @@ -1482,16 +1482,16 @@ "value": "[parameters('_artifactsLocationSasToken')]" }, "userAssignedIdentityResourceId":{ - "value": "[reference(variables('name_uamiForPostDeploymentScript'),'2023-07-01').outputs.uamidForPostDeployment.value]" + "value": "[reference(variables('name_uamiForPostDeploymentScript'),'${azure.apiVersionForDeployment}').outputs.uamidForPostDeployment.value]" } } } }, { - "apiVersion": "2023-07-01", - "name": "0fa14086-2d46-54a4-8aba-470addc3dce6", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.end}", "type": "Microsoft.Resources/deployments", - "tags": "[variables('obj_tagsByResources')['Microsoft resources deployment']]", + "tags": "[variables('obj_tagsByResources')['${identifier.resourcesDeployment}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('clusterTemplateRef'))]", "[resourceId('Microsoft.Resources/deployments', 'keyVaultwithSelfSignedAppGatewaySSLCert')]", @@ -1522,35 +1522,35 @@ }, "wlsDomainLocation": { "type": "string", - "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.wlsDomainLocation.value]" + "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.wlsDomainLocation.value]" }, "adminHostName": { "type": "string", - "value": "[reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminHostName.value]" + "value": "[reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminHostName.value]" }, "adminConsole": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminConsole.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminConsole.value)]" }, "adminSecuredConsole": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminSecuredConsole.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminSecuredConsole.value)]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminRemoteConsoleURL.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]" }, "adminRemoteConsoleSecuredURL": { "type": "string", - "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '2023-07-01').outputs.adminRemoteConsoleSecuredURL.value)]" + "value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecuredURL.value)]" }, "appGatewayURL": { "type": "string", - "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('http://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '2023-07-01').outputs.appGatewayURL.value),'')]" + "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('http://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value),'')]" }, "appGatewaySecuredURL": { "type": "string", - "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('https://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '2023-07-01').outputs.appGatewaySecuredURL.value),'')]" + "value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('https://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewaySecuredURL.value),'')]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json index c56356854..8b4415932 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appGatewayConnectorTemplate.json @@ -137,7 +137,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "virtualNetworkNewOrExisting": { @@ -201,9 +201,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "d7c730b9-494c-5cc2-9695-cc1057da3e0b", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.appgateway.custom.certificate}", "condition": "[not(equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert')))]", "properties": { "mode": "Incremental", @@ -217,8 +217,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "appGatewaywithExistingSSLCertTemplate", "condition": "[equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionHaveCert'))]", "properties": { @@ -305,8 +305,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "appGatewaywithSelfSignedSSLCertTemplate", "condition": "[equals(parameters('appGatewayCertificateOption'), variables('const_appGatewaySSLCertOptionGenerateCert'))]", "properties": { @@ -401,16 +401,16 @@ "appGatewayAlias": { "type": "string", "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')), - reference('appGatewaywithExistingSSLCertTemplate', '2023-07-01').outputs.appGatewayAlias.value, - reference('appGatewaywithSelfSignedSSLCertTemplate', '2023-07-01').outputs.appGatewayAlias.value)]" + reference('appGatewaywithExistingSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayAlias.value, + reference('appGatewaywithSelfSignedSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayAlias.value)]" }, "appGatewayURL": { "type": "string", - "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '2023-07-01').outputs.appGatewayURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '2023-07-01').outputs.appGatewayURL.value)]" + "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value)]" }, "appGatewaySecuredURL": { "type": "string", - "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '2023-07-01').outputs.appGatewaySecuredURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '2023-07-01').outputs.appGatewaySecuredURL.value)]" + "value": "[if(equals(parameters('appGatewayCertificateOption'),variables('const_appGatewaySSLCertOptionHaveCert')),reference('appGatewaywithExistingSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewaySecuredURL.value, reference('appGatewaywithSelfSignedSSLCertTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewaySecuredURL.value)]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json index 0740e950e..ba47748a4 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json @@ -17,7 +17,7 @@ }, "resources": [ { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('vmName')]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json index 6c9299c8d..4daf450f0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json @@ -88,7 +88,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsUserName": { @@ -117,9 +117,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "9e8f86ad-dcf5-5acd-a1f5-26d62358f218", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.database.start}", "properties": { "mode": "Incremental", "template": { @@ -131,9 +131,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", "properties": { @@ -156,9 +156,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "a1760bef-276e-53eb-bea2-e150d7638b49", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.database.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -174,9 +174,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "692b2d84-72f5-5992-a15d-0d5bcfef040d", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.oracle}", "condition": "[if(contains(parameters('databaseType'), 'oracle'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -193,9 +193,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "935df06e-a5d5-5bf1-af66-4c1eb71dac7a", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.postgresql}", "condition": "[if(contains(parameters('databaseType'), 'postgresql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -212,9 +212,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "41c353ae-6f7b-442f-b903-996cb42c1bbe", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.mysql}", "condition": "[if(contains(parameters('databaseType'), 'mysql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -231,9 +231,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "3569588c-b89d-5567-84ee-a2c633c7204c", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${database.sqlserver}", "condition": "[if(contains(parameters('databaseType'), 'sqlserver'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json index a82179852..2dfcf0629 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json @@ -42,7 +42,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "ttl": { @@ -67,8 +67,8 @@ "resources": [ { "type": "Microsoft.Network/dnszones", - "apiVersion": "2023-07-01-preview", - "tags": "[parameters('tagsByResource')['Microsoft.Network/dnszones']]", + "apiVersion": "${azure.apiVersionForDNSZone}", + "tags": "[parameters('tagsByResource')['${identifier.dnszones}']]", "name": "[parameters('dnszoneName')]", "location": "[parameters('location')]", "properties": { @@ -77,7 +77,7 @@ }, { "type": "Microsoft.Network/dnszones/A", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "condition": "[variables('const_hasARecords')]", "name": "[concat(parameters('dnszoneName'), '/', variables('const_dnszonesARecordSetNames')[copyIndex()])]", "copy": { @@ -96,7 +96,7 @@ }, { "type": "Microsoft.Network/dnszones/CNAME", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "condition": "[variables('const_hasCNAMERecords')]", "name": "[concat(parameters('dnszoneName'),'/', variables('const_dnszonesCNAMERecordSetNames')[copyIndex()])]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json index 4b29eef0f..0e2b79f4d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json @@ -12,7 +12,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } } }, @@ -24,15 +24,15 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "2023-01-31", - "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", + "apiVersion": "${azure.apiVersionForIdentity}", + "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", "name": "[parameters('uamiName')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "[variables('name_deploymentScriptContributorRoleAssignmentName')]", "subscriptionId": "[subscription().subscriptionId]", "location": "[parameters('location')]", @@ -69,7 +69,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2022-04-01", + "apiVersion": "${azure.apiVersionForRoleAssignment}", "name": "[variables('name_roleAssignmentName')]", "properties": { "description": "Assign subscription scope role to User Assigned Managed Identity ", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json index 34b948ea7..c77d29f55 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json @@ -74,7 +74,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "ttl": { @@ -120,8 +120,8 @@ { "type": "Microsoft.Resources/deployments", "name": "uamiDeployment", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "apiVersion": "2023-07-01", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "apiVersion": "${azure.apiVersionForDeployment}", "properties": { "mode": "Incremental", "templateLink": { @@ -143,8 +143,8 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", - "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", + "apiVersion": "${azure.apiVersionForDeploymentScript}", + "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'uamiDeployment')]" ], @@ -159,7 +159,7 @@ "kind": "AzureCLI", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "AzCliVersion": "2.53.0", + "AzCliVersion": "${azure.cli.version}", "timeout": "PT30M", "environmentVariables": [ { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json index 462213ba0..b6d2087d7 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json @@ -75,7 +75,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsDomainName": { @@ -107,9 +107,9 @@ }, "resources": [ { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "name": "[concat(variables('const_managedVMPrefix'), copyIndex(1),'/newuserscript')]", "location": "[parameters('location')]", "copy": { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json index 0139be3f1..87c767643 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultWithNewCertTemplate.json @@ -59,7 +59,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "utcValue": { @@ -75,14 +75,14 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "2023-01-31", - "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", + "apiVersion": "${azure.apiVersionForIdentity}", + "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", "name": "[variables('name_deploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2022-04-01", + "apiVersion": "${azure.apiVersionForRoleAssignment}", "name": "[variables('name_roleAssignmentName')]", "dependsOn": [ "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('name_deploymentScriptUserDefinedManagedIdentity'))]" @@ -96,8 +96,8 @@ }, { "type": "Microsoft.KeyVault/vaults", - "apiVersion": "2024-11-01", - "tags": "[parameters('tagsByResource')['Microsoft.KeyVault/vaults']]", + "apiVersion": "${azure.apiVersionForKeyVault}", + "tags": "[parameters('tagsByResource')['${identifier.vaults}']]", "name": "[parameters('keyvaultName')]", "dependsOn": [ "[resourceId('Microsoft.Authorization/roleAssignments', variables('name_roleAssignmentName'))]" @@ -125,8 +125,8 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", - "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", + "apiVersion": "${azure.apiVersionForDeploymentScript}", + "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", "name": "[concat('script-generate-certificate-', parameters('_globalResourceNameSuffix'))]", "location": "[parameters('location')]", "dependsOn": [ @@ -141,7 +141,7 @@ "kind": "AzurePowerShell", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "azPowerShellVersion": "11.5", + "azPowerShellVersion": "${azure.powershell.version}", "timeout": "PT30M", "arguments": "[format(' -vaultName {0} -certificateName {1} -subjectName {2}', parameters('keyvaultName'), parameters('secretName'), parameters('subjectName'))]", "environmentVariables": [ diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json index 773f2e3b0..7eb7112ad 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json @@ -96,7 +96,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsDomainName": { @@ -121,7 +121,7 @@ }, "variables": { "const_connectionString": "[if(and(equals(parameters('databaseType'),'sqlserver'), equals(last(parameters('dsConnectionURL')),';')), take(parameters('dsConnectionURL'), add(length(parameters('dsConnectionURL')),-1)),parameters('dsConnectionURL'))]", - "const_identityAPIVersion": "2023-01-31", + "const_identityAPIVersion": "${azure.apiVersionForIdentity}", "const_managedVMPrefix": "[concat(parameters('managedVMNamePrefix'), 'VM')]", "const_msiDefaultUser": "msiUser", "name_appendIdentityTemplate": "_appendUserManagedIdentity.json", @@ -155,9 +155,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "340f5265-6de7-5b6f-aad3-9f179736cde0", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.pswless.database.start}", "properties": { "mode": "Incremental", "template": { @@ -169,8 +169,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "[concat('assignDbIdentityTo',variables('const_managedVMPrefix'), copyIndex(1))]", "copy": { "name": "virtualMachineIdentityLoop", @@ -190,7 +190,7 @@ "value": "[variables('obj_dbIdentity')]" }, "existingIdentities": { - "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" + "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" }, "location": { "value": "[parameters('location')]" @@ -200,8 +200,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "installJdbcLibsTemplate", "condition": "[or(equals(parameters('databaseType'),'mysql'), equals(parameters('databaseType'),'postgresql'))]", "dependsOn": [ @@ -258,8 +258,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "passwordlessDatasourceDeployment", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'installJdbcLibsTemplate')]" @@ -315,9 +315,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "b4d91140-fb26-50de-9358-147b9dd25f7a", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.pswless.database.end}", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'passwordlessDatasourceDeployment')]" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json index 344f8de1a..74a24fc17 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json @@ -112,7 +112,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "virtualNetworkNewOrExisting": { @@ -238,9 +238,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "4f85ce49-6de4-5925-b77c-3eb15ba97921", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.appgateway.start}", "properties": { "mode": "Incremental", "template": { @@ -252,9 +252,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']]", + "tags": "[parameters('tagsByResource')['${identifier.publicIPAddresses}']]", "name": "[parameters('gatewayPublicIPAddressName')]", "sku": { "name": "Standard" @@ -269,8 +269,8 @@ }, { "type": "Microsoft.Network/applicationGateways", - "apiVersion": "2023-06-01", - "tags": "[parameters('tagsByResource')['Microsoft.Network/applicationGateways']]", + "apiVersion": "${azure.apiVersionForApplicationGateways}", + "tags": "[parameters('tagsByResource')['${identifier.applicationGateways}']]", "name": "[parameters('appGatewayName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -338,7 +338,7 @@ "name": "BackendAddresses", "count": "[sub(int(parameters('numberOfInstances')),1)]", "input": { - "ipAddress": "[reference(resourceId('Microsoft.Network/networkInterfaces', concat(variables('name_managedVMNamePrefix'), copyIndex('BackendAddresses',1), if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), variables('name_nic_with_pub_ip'), variables('name_nic_without_pub_ip')))),'2023-06-01').ipConfigurations[0].properties.privateIPAddress]" + "ipAddress": "[reference(resourceId('Microsoft.Network/networkInterfaces', concat(variables('name_managedVMNamePrefix'), copyIndex('BackendAddresses',1), if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), variables('name_nic_with_pub_ip'), variables('name_nic_without_pub_ip')))),'${azure.apiVersionForNetworkInterfaces}').ipConfigurations[0].properties.privateIPAddress]" } } ] @@ -458,9 +458,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", "dependsOn": [ @@ -477,15 +477,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAGWConfiguration'),' <<< \"', variables('const_adminServerName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ', if(parameters('overrideHostName'), parameters('customDomainName'), reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn), ' ',variables('const_wlsHome'),'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAGWConfiguration'),' <<< \"', variables('const_adminServerName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ', if(parameters('overrideHostName'), parameters('customDomainName'), reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), ' ',variables('const_wlsHome'),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "b626bee4-b322-5418-990f-6463a799be3c", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.appgateway.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -503,15 +503,15 @@ "outputs": { "appGatewayAlias": { "type": "string", - "value": "[reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn]" + "value": "[reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn]" }, "appGatewayURL": { "type": "string", - "value": "[uri(format('http://{0}',reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn),'')]" + "value": "[uri(format('http://{0}',reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn),'')]" }, "appGatewaySecuredURL": { "type": "string", - "value": "[uri(format('https://{0}',reference(variables('ref_appGatewayPublicIP'), '2023-06-01').dnsSettings.fqdn),'')]" + "value": "[uri(format('https://{0}',reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn),'')]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json index bec6c9b15..3774a0767 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json @@ -145,7 +145,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "usePreviewImage": { @@ -423,9 +423,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "07bfd1f7-83ff-50cd-bd74-61b00a2a6808", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.cluster.start}", "properties": { "mode": "Incremental", "template": { @@ -438,9 +438,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "e09585b6-b7cb-5437-a600-c95c88ac37b3", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.ssl.start}", "properties": { "mode": "Incremental", "template": { @@ -452,9 +452,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "type": "Microsoft.Network/networkSecurityGroups", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", + "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -519,8 +519,8 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2025-01-01", - "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", + "apiVersion": "${azure.apiVersionForStorage}", + "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -535,10 +535,10 @@ ] }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPrivateEndpoint}", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", + "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -563,7 +563,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -575,7 +575,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -586,9 +586,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", "location": "[parameters('location')]", "copy": { @@ -606,9 +606,9 @@ ] }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -624,9 +624,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", "location": "[parameters('location')]", "copy": { @@ -659,8 +659,8 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2023-06-01", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -679,7 +679,7 @@ "properties": { "privateIPAllocationMethod": "Dynamic", "publicIPAddress": { - "id": "[resourceId('Microsoft.Network/publicIPAddresses',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" + "id": "[resourceId('${identifier.publicIPAddresses}',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" }, "subnet": { "id": "[variables('ref_subnet')]" @@ -691,8 +691,8 @@ }, { "type": "Microsoft.Compute/availabilitySets", - "apiVersion": "2024-11-01", - "tags": "[parameters('tagsByResource')['Microsoft.Compute/availabilitySets']]", + "apiVersion": "${azure.apiVersionForAvailabilitySets}", + "tags": "[parameters('tagsByResource')['${identifier.availabilitySets}']]", "location": "[parameters('location')]", "name": "[variables('name_availabilitySet')]", "properties": { @@ -707,9 +707,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", "copy": { @@ -760,7 +760,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -771,9 +771,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'), copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", "copy": { @@ -799,15 +799,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "4f29ea52-dfd6-5537-8a38-4ad9fec1b2eb", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.ssl.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -823,9 +823,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "f05658d8-329d-55e8-9077-5761b8279b31", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.cluster.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -841,9 +841,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk21-ol94}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -861,9 +861,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk21-ol810}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -881,9 +881,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk17-ol94}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -901,9 +901,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "69b6b433-1679-4d37-af25-3d56987c217a", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk17-ol810}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -921,9 +921,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "cd48f178-52a3-415e-88bb-caa45f615b94", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk11-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -941,9 +941,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk11-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -961,9 +961,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -981,9 +981,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -1001,9 +1001,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-122140-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -1021,9 +1021,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-122140-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -1041,9 +1041,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk11-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1060,9 +1060,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1079,9 +1079,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-122140-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1108,23 +1108,23 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" }, "adminRemoteConsoleSecuredURL": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" }, "wlsDomainLocation": { "type": "string", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json index 9facba151..a4d6f0ea8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json @@ -139,7 +139,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "usePreviewImage": { @@ -367,9 +367,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "07bfd1f7-83ff-50cd-bd74-61b00a2a6808", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.cluster.start}", "properties": { "mode": "Incremental", "template": { @@ -381,9 +381,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "type": "Microsoft.Network/networkSecurityGroups", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']]", + "tags": "[parameters('tagsByResource')['${identifier.networkSecurityGroups}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", "location": "[parameters('location')]", @@ -448,9 +448,9 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorage}", "name": "[variables('name_storageAccount')]", - "tags": "[parameters('tagsByResource')['Microsoft.Storage/storageAccounts']]", + "tags": "[parameters('tagsByResource')['${identifier.storageAccounts}']]", "location": "[parameters('location')]", "sku": { "name": "[variables('const_storageAccountType')]" @@ -464,10 +464,10 @@ ] }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPrivateEndpoint}", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", - "tags": "[parameters('tagsByResource')['Microsoft.Network/privateEndpoints']]", + "tags": "[parameters('tagsByResource')['${identifier.privateEndpoints}']]", "location": "[parameters('location')]", "properties": { "privateLinkServiceConnections": [ @@ -492,7 +492,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -504,7 +504,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -515,9 +515,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],if(empty(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['Microsoft.Network/publicIPAddresses'],createObject(parameters('const_guidTag'),''))))]", + "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),parameters('tagsByResource')['${identifier.publicIPAddresses}'],if(empty(parameters('tagsByResource')['${identifier.publicIPAddresses}']),createObject(parameters('const_guidTag'),''),union(parameters('tagsByResource')['${identifier.publicIPAddresses}'],createObject(parameters('const_guidTag'),''))))]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", "location": "[parameters('location')]", "copy": { @@ -535,9 +535,9 @@ ] }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks", - "tags": "[parameters('tagsByResource')['Microsoft.Network/virtualNetworks']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualNetworks}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", @@ -552,9 +552,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", "location": "[parameters('location')]", "copy": { @@ -587,8 +587,8 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2023-06-01", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -607,7 +607,7 @@ "properties": { "privateIPAllocationMethod": "Dynamic", "publicIPAddress": { - "id": "[resourceId('Microsoft.Network/publicIPAddresses',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" + "id": "[resourceId('${identifier.publicIPAddresses}',if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress'))))]" }, "subnet": { "id": "[variables('ref_subnet')]" @@ -619,8 +619,8 @@ }, { "type": "Microsoft.Compute/availabilitySets", - "apiVersion": "2024-11-01", - "tags": "[parameters('tagsByResource')['Microsoft.Compute/availabilitySets']]", + "apiVersion": "${azure.apiVersionForAvailabilitySets}", + "tags": "[parameters('tagsByResource')['${identifier.availabilitySets}']]", "location": "[parameters('location')]", "name": "[variables('name_availabilitySet')]", "properties": { @@ -635,9 +635,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", "copy": { @@ -688,7 +688,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -699,9 +699,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'), copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", "copy": { @@ -727,15 +727,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false',' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'), ' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0],'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false',' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'), ' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "f05658d8-329d-55e8-9077-5761b8279b31", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${cluster.cluster.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -751,9 +751,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk21-ol94}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -771,9 +771,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk21-ol810}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -791,9 +791,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk17-ol94}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ @@ -811,9 +811,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "69b6b433-1679-4d37-af25-3d56987c217a", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141200-jdk17-ol810}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ @@ -831,9 +831,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "cd48f178-52a3-415e-88bb-caa45f615b94", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk11-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -851,9 +851,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk11-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -871,9 +871,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -891,9 +891,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -911,9 +911,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-122140-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ @@ -931,9 +931,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-122140-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ @@ -951,9 +951,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk11-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -970,9 +970,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-141100-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -989,9 +989,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", - "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", + "name": "${from.owls-122140-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1018,23 +1018,23 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "adminRemoteConsoleURL": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]" }, "adminRemoteConsoleSecuredURL": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]" }, "wlsDomainLocation": { "type": "string", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json index b09600f06..e013979b0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json @@ -147,7 +147,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "usePreviewImage": { @@ -333,10 +333,10 @@ ], "resources": [ { - "apiVersion": "2023-07-01", - "name": "157eab40-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.coherence.start}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "template": { @@ -348,9 +348,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']]", + "tags": "[parameters('tagsByResource')['${identifier.publicIPAddresses}']]", "name": "[concat(variables('name_vmPrefix'),copyIndex(1),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", "copy": { @@ -365,15 +365,15 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[parameters('tagsByResource')['Microsoft.Network/networkInterfaces']]", + "tags": "[parameters('tagsByResource')['${identifier.networkInterfaces}']]", "name": "[concat(variables('name_vmPrefix'), copyIndex(1), variables('name_nic'))]", "location": "[parameters('location')]", "copy": { @@ -404,9 +404,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", - "tags": "[parameters('tagsByResource')['Microsoft.Compute/virtualMachines']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachines}']]", "name": "[concat(variables('name_vmPrefix'), copyIndex(1))]", "location": "[parameters('location')]", "copy": { @@ -450,7 +450,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -462,9 +462,9 @@ }, { "type": "Microsoft.Compute/virtualMachines/extensions", - "tags": "[parameters('tagsByResource')['Virtual machine extension']]", + "tags": "[parameters('tagsByResource')['${identifier.virtualMachinesExtensions}']]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('name_vmPrefix'), copyIndex(),'/newuserscript'))]", - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "location": "[parameters('location')]", "copy": { "name": "virtualMachineExtensionLoop", @@ -488,15 +488,15 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfCoherenceCacheInstances'),' ',variables('name_vmPrefix'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','False',' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfCoherenceCacheInstances'),' ',variables('name_vmPrefix'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','False',' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { - "apiVersion": "2023-07-01", - "name": "157eaa6e-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.coherence.end}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "dependsOn": [ "virtualMachineExtensionLoop" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json index bd5d7b26d..f5beb33c8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json @@ -110,7 +110,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "wlsDomainName": { @@ -141,8 +141,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "pswlessDbTemplate", "condition": "[parameters('enablePswlessConnection')]", "properties": { @@ -208,9 +208,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "upgradeMySQLJdbcDriverTemplate", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[and(not(parameters('enablePswlessConnection')), equals(parameters('databaseType'),'mysql'))]", "properties": { "mode": "Incremental", @@ -263,9 +263,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "passwordDatasourceDeployment", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "condition": "[not(parameters('enablePswlessConnection'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'upgradeMySQLJdbcDriverTemplate')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json index 17255efbb..9ee842405 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json @@ -87,7 +87,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "ttl": { @@ -112,9 +112,9 @@ }, "resources": [ { - "apiVersion": "2023-07-01", - "name": "c40d7aa8-9fe7-51c6-86de-27e1b1678735", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.dns.start}", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -126,9 +126,9 @@ } }, { - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "createDNSZone", "condition": "[not(parameters('hasDNSZones'))]", "properties": { @@ -166,9 +166,9 @@ } }, { - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "name": "updateDNSZone", "condition": "[parameters('hasDNSZones')]", "properties": { @@ -221,10 +221,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "022d99e3-8ba3-5822-b6d5-bcec64518286", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.dns.end}", "type": "Microsoft.Resources/deployments", - "tags": "[parameters('tagsByResource')['Microsoft resources deployment']]", + "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", "properties": { "mode": "Incremental", "template": { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json index 2d84c8d31..462b9487d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json @@ -29,7 +29,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsAllowed')]", "condition": "[not(parameters('denyPublicTrafficForAdminServer'))]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "TCP", "sourcePortRange": "*", @@ -48,7 +48,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsDenied')]", "condition": "[parameters('denyPublicTrafficForAdminServer')]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -67,7 +67,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsAllowed')]", "condition": "[and(not(parameters('denyPublicTrafficForManagedServer')), parameters('enableAppGateway'))]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -85,7 +85,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsDenied')]", "condition": "[and(parameters('denyPublicTrafficForManagedServer'), parameters('enableAppGateway'))]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "*", "sourcePortRange": "*", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json index e8f98fedb..98adee5f9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "const_guidTag" :{ @@ -62,9 +62,9 @@ }, "resources": [ { - "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", - "tags": "[parameters('tagsByResource')['Microsoft.Resources/deploymentScripts']]", + "type": "${identifier.deploymentScripts}", + "apiVersion": "${azure.apiVersionForDeploymentScript}", + "tags": "[parameters('tagsByResource')['${identifier.deploymentScripts}']]", "name": "[concat('postdeployscript-', parameters('_globalResourceNameSuffix'))]", "kind": "AzureCLI", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json index 4afabcc7d..2f0cb1387 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json @@ -18,7 +18,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "roleAssignmentNameSeed": { @@ -36,20 +36,20 @@ }, "resources": [ { - "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "2023-01-31", - "tags": "[parameters('tagsByResource')['Microsoft.ManagedIdentity/userAssignedIdentities']]", + "type": "${identifier.userAssignedIdentities}", + "apiVersion": "${azure.apiVersionForIdentity}", + "tags": "[parameters('tagsByResource')['${identifier.userAssignedIdentities}']]", "name": "[variables('name_postDeploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_postDeploymentScriptRoleAssignment')]", "location": "[parameters('location')]", "subscriptionId": "[subscription().subscriptionId]", "dependsOn": [ - "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" + "[resourceId('${identifier.userAssignedIdentities}', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" ], "properties": { "mode": "Incremental", @@ -76,7 +76,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2022-04-01", + "apiVersion": "${azure.apiVersionForRoleAssignment}", "name": "[variables('roleAssignmentGuid')]", "properties": { "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', parameters('innerRoleDefinitionId'))]", @@ -88,7 +88,7 @@ }, "parameters": { "innerPrincipalId": { - "value": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities',variables('name_postDeploymentScriptUserDefinedManagedIdentity'))).principalId]" + "value": "[reference(resourceId('${identifier.userAssignedIdentities}',variables('name_postDeploymentScriptUserDefinedManagedIdentity'))).principalId]" }, "innerRoleDefinitionId": { "value": "[variables('const_roleDefinitionIdOfContributor')]" @@ -103,7 +103,7 @@ "outputs": { "uamidForPostDeployment": { "type": "string", - "value": "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" + "value": "[resourceId('${identifier.userAssignedIdentities}', variables('name_postDeploymentScriptUserDefinedManagedIdentity'))]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json index 12a322e90..bab15a8b0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json @@ -93,8 +93,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "7d4ae6d6-17c5-5168-b7d2-e0bf33a1e878", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.deletenode.start}", "properties": { "mode": "Incremental", "template": { @@ -106,7 +106,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -127,8 +127,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "4b263220-3cc6-53b9-aef3-23ad10c45d52", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.deletenode.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], 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 0016bd373..f24a984a6 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 @@ -286,8 +286,8 @@ ], "resources": [ { - "apiVersion": "2023-07-01", - "name": "157ea410-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.addnode.coherence.start}", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -300,7 +300,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_cacheServerIndexOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -316,13 +316,13 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -354,7 +354,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')))]", "location": "[parameters('location')]", @@ -399,7 +399,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -410,7 +410,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_cacheServerIndexOffset')),'/newuserscript')]", "location": "[parameters('location')]", @@ -437,13 +437,13 @@ ] }, "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')), '2025-01-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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,base64(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_scriptCoherenceFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').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')),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,base64(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'),'\"')]" } } }, { - "apiVersion": "2023-07-01", - "name": "157ea1ea-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.addnode.coherence.end}", "type": "Microsoft.Resources/deployments", "dependsOn": [ "virtualMachineExtensionLoop" 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 697ff0357..94a0f995b 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 @@ -311,8 +311,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "5f68f633-701b-58b0-83c2-399c6d1d8414", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.addnode.start}", "properties": { "mode": "Incremental", "template": { @@ -323,7 +323,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -339,13 +339,13 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmMachine'),copyIndex(variables('const_appNodeMachineOffset')), variables('name_nic'))]", "location": "[parameters('location')]", @@ -377,7 +377,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')))]", "location": "[parameters('location')]", @@ -422,7 +422,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -433,7 +433,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('name_vmMachine'), copyIndex(variables('const_appNodeMachineOffset')), '/newuserscript')]", "location": "[parameters('location')]", @@ -460,14 +460,14 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ',copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('dynamicClusterSize'),' ', variables('const_managedVMPrefix'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2025-01-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'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('dynamicClusterSize'),' ', variables('const_managedVMPrefix'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').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'),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',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'),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "449e677a-5fc3-55cb-9193-4b225f42e646", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.addnode.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json index 4c06ddf76..27137136f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json @@ -90,7 +90,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" + ${azure.armBased.vmSize.list} ] }, "osPlatform": "Linux", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json index 314a2e33e..86c52e4e9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json @@ -550,8 +550,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "pid-89d7f595-f164-4cbd-abbb-e46cd0b342e8-partnercenter", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.start}", "properties": { "mode": "Incremental", "template": { @@ -563,7 +563,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_clusterTemplate')]", "condition": "[not(parameters('enableCustomSSL'))]", "properties": { @@ -674,7 +674,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_clusterCustomSSLTemplate')]", "condition": "[parameters('enableCustomSSL')]", "properties": { @@ -812,7 +812,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "networkSecurityLinkedTemplate", "properties": { @@ -843,7 +843,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "dbLinkedTemplate", "condition": "[parameters('enableDB')]", "dependsOn": [ @@ -919,7 +919,7 @@ "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[and(parameters('enableCoherence'),not(parameters('enableCustomSSL')))]", "properties": { "mode": "Incremental", @@ -974,7 +974,7 @@ "value": "[parameters('subnetName')]" }, "storageAccountName": { - "value": "[reference(variables('ref_clusterTemplate'), '2023-07-01').outputs.storageAccountName.value]" + "value": "[reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" }, "usePreviewImage": { "value": "[parameters('usePreviewImage')]" @@ -1015,7 +1015,7 @@ "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]" ], - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[and(parameters('enableCoherence'),parameters('enableCustomSSL'))]", "properties": { "mode": "Incremental", @@ -1067,7 +1067,7 @@ "value": "[parameters('skuUrnVersion')]" }, "storageAccountName": { - "value": "[reference(variables('ref_clusterTemplate'), '2023-07-01').outputs.storageAccountName.value]" + "value": "[reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" }, "usePreviewImage": { "value": "[parameters('usePreviewImage')]" @@ -1137,7 +1137,7 @@ "[resourceId('Microsoft.Resources/deployments', 'coherenceTemplate')]", "[resourceId('Microsoft.Resources/deployments', 'coherenceTemplateWithCustomSSL')]" ], - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "condition": "[parameters('enableOHS')]", "properties": { "mode": "Incremental", @@ -1165,7 +1165,7 @@ "value": "[parameters('dnsLabelPrefix')]" }, "storageAccountName": { - "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.storageAccountName.value]" + "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.storageAccountName.value]" }, "subnetName": { "value": "[parameters('subnetName')]" @@ -1216,13 +1216,13 @@ "value": "[parameters('virtualNetworkResourceGroupName')]" }, "virtualNetworkName": { - "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.virtualNetworkName.value]" + "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.virtualNetworkName.value]" }, "vmSize": { "value": "[parameters('vmSize')]" }, "adminRestMgmtURL": { - "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminRestMgmtURL.value]" + "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminRestMgmtURL.value]" }, "wlsPassword": { "value": "[parameters('wlsPassword')]" @@ -1238,7 +1238,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "dnszonesLinkedTemplate", "condition": "[parameters('enableCustomDNS')]", "dependsOn": [ @@ -1276,14 +1276,14 @@ "value": "[parameters('dnszoneResourceGroup')]" }, "targetResources": { - "value": "[if(parameters('enableOHS'), createArray(reference(variables('ref_clusterTemplate'), '2023-07-01').outputs._adminPublicIPId.value, reference('ohsLinkedTemplate', '2023-07-01').outputs._ohsPublicIP.value), createArray(reference(variables('ref_clusterTemplate'), '2023-07-01').outputs._adminPublicIPId.value))]" + "value": "[if(parameters('enableOHS'), createArray(reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value, reference('ohsLinkedTemplate', '${azure.apiVersionForDeployment}').outputs._ohsPublicIP.value), createArray(reference(variables('ref_clusterTemplate'), '${azure.apiVersionForDeployment}').outputs._adminPublicIPId.value))]" } } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_uamiForPostDeploymentScript')]", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "dependsOn": [ @@ -1313,7 +1313,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "postDeplyment", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "dependsOn": [ @@ -1349,15 +1349,15 @@ "value": "[parameters('_artifactsLocationSasToken')]" }, "userAssignedIdentityResourceId":{ - "value": "[reference(variables('name_uamiForPostDeploymentScript'),'2023-07-01').outputs.uamidForPostDeployment.value]" + "value": "[reference(variables('name_uamiForPostDeploymentScript'),'${azure.apiVersionForDeployment}').outputs.uamidForPostDeployment.value]" } } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "93da13bf-11f6-5bfb-9b51-7deb152a21c3", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.end}", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', variables('ref_clusterTemplate'))]", "[resourceId('Microsoft.Resources/deployments', 'dbLinkedTemplate')]", @@ -1390,19 +1390,19 @@ }, "wlsDomainLocation": { "type": "string", - "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.wlsDomainLocation.value]" + "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.wlsDomainLocation.value]" }, "adminHostName": { "type": "string", - "value": "[reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminHostName.value]" + "value": "[reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminHostName.value]" }, "adminConsole": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminConsole.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminConsole.value)]" }, "adminSecuredConsole": { "type": "string", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'2023-07-01').outputs.adminSecuredConsole.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('ref_clusterTemplate'),'${azure.apiVersionForDeployment}').outputs.adminSecuredConsole.value)]" }, "ohsVMName": { "type": "string", @@ -1411,12 +1411,12 @@ "ohsAccessURL": { "type": "string", "condition": "[parameters('enableOHS')]", - "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'), parameters('ohshttpPort')),''),reference('ohsLinkedTemplate', '2023-07-01').outputs.ohsAccessURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'), parameters('ohshttpPort')),''),reference('ohsLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.ohsAccessURL.value)]" }, "ohsSecureAccessURL": { "type": "string", "condition": "[parameters('enableOHS')]", - "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'),parameters('ohshttpsPort')),''), reference('ohsLinkedTemplate', '2023-07-01').outputs.ohsSecureAccessURL.value)]" + "value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'),parameters('ohshttpsPort')),''), reference('ohsLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.ohsSecureAccessURL.value)]" } } } \ No newline at end of file diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json index 0740e950e..ba47748a4 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_appendUserManagedIdentity.json @@ -17,7 +17,7 @@ }, "resources": [ { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('vmName')]", "location": "[parameters('location')]", 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 b56716a3a..0bd5719af 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 @@ -110,8 +110,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "488f2f70-6999-5970-bae9-251097c2d0b6", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.database.start}", "properties": { "mode": "Incremental", "template": { @@ -123,7 +123,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -147,8 +147,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "699d05c7-41f8-5512-aeef-f68651e247c2", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.database.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -164,8 +164,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "692b2d84-72f5-5992-a15d-0d5bcfef040d", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${database.oracle}", "condition": "[if(contains(parameters('databaseType'), 'oracle'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -182,8 +182,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "935df06e-a5d5-5bf1-af66-4c1eb71dac7a", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${database.postgresql}", "condition": "[if(contains(parameters('databaseType'), 'postgresql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -200,8 +200,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "41c353ae-6f7b-442f-b903-996cb42c1bbe", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${database.mysql}", "condition": "[if(contains(parameters('databaseType'), 'mysql'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" @@ -218,8 +218,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "3569588c-b89d-5567-84ee-a2c633c7204c", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${database.sqlserver}", "condition": "[if(contains(parameters('databaseType'), 'sqlserver'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json index a3ebbc105..35316550f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json @@ -60,7 +60,7 @@ "resources": [ { "type": "Microsoft.Network/dnszones", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "name": "[parameters('dnszoneName')]", "location": "[parameters('location')]", "properties": { @@ -69,7 +69,7 @@ }, { "type": "Microsoft.Network/dnszones/A", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "condition": "[variables('const_hasARecords')]", "name": "[concat(parameters('dnszoneName'), '/', variables('const_dnszonesARecordSetNames')[copyIndex()])]", "copy": { @@ -88,7 +88,7 @@ }, { "type": "Microsoft.Network/dnszones/CNAME", - "apiVersion": "2023-07-01-preview", + "apiVersion": "${azure.apiVersionForDNSZone}", "condition": "[variables('const_hasCNAMERecords')]", "name": "[concat(parameters('dnszoneName'),'/', variables('const_dnszonesCNAMERecordSetNames')[copyIndex()])]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json index 3f07c518b..c8d6c3eeb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json @@ -17,13 +17,13 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "2023-01-31", + "apiVersion": "${azure.apiVersionForIdentity}", "name": "[parameters('uamiName')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_deploymentScriptContributorRoleAssignmentName')]", "subscriptionId": "[subscription().subscriptionId]", "location": "[parameters('location')]", @@ -60,7 +60,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2022-04-01", + "apiVersion": "${azure.apiVersionForRoleAssignment}", "name": "[variables('name_roleAssignmentName')]", "properties": { "description": "Assign subscription scope role to User Assigned Managed Identity ", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json index 79ee69b06..b03e9d1c1 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json @@ -113,7 +113,7 @@ { "type": "Microsoft.Resources/deployments", "name": "uamiDeployment", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "properties": { "mode": "Incremental", "templateLink": { @@ -132,7 +132,7 @@ }, { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", + "apiVersion": "${azure.apiVersionForDeploymentScript}", "name": "[concat('script-create-dns-records-', parameters('_globalResourceNameSuffix'))]", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'uamiDeployment')]" @@ -147,7 +147,7 @@ "kind": "AzureCLI", "properties": { "forceUpdateTag": "[parameters('utcValue')]", - "AzCliVersion": "2.53.0", + "AzCliVersion": "${azure.cli.version}", "timeout": "PT30M", "environmentVariables": [ { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json index bcbc3e8c0..68a2cfc29 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json @@ -100,7 +100,7 @@ }, "resources": [ { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(variables('const_managedVMPrefix'), copyIndex(1),'/newuserscript')]", "location": "[parameters('location')]", @@ -124,7 +124,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'), '/newuserscript')]", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json index c301bca81..f5d330105 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json @@ -114,7 +114,7 @@ }, "variables": { "const_connectionString": "[if(and(equals(parameters('databaseType'),'sqlserver'), equals(last(parameters('dsConnectionURL')),';')), take(parameters('dsConnectionURL'), add(length(parameters('dsConnectionURL')),-1)),parameters('dsConnectionURL'))]", - "const_identityAPIVersion": "2023-01-31", + "const_identityAPIVersion": "${azure.apiVersionForIdentity}", "const_managedVMPrefix": "[concat(parameters('managedVMNamePrefix'), 'VM')]", "const_msiDefaultUser": "msiUser", "name_appendIdentityTemplate": "_appendUserManagedIdentity.json", @@ -148,8 +148,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2d02881c-c7d2-5e16-b9b8-c48ebf70d2ab", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.pswless.database.start}", "properties": { "mode": "Incremental", "template": { @@ -161,7 +161,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[concat('assignDbIdentityTo',variables('const_managedVMPrefix'), copyIndex(1))]", "copy": { "name": "virtualMachineIdentityLoop", @@ -181,7 +181,7 @@ "value": "[variables('obj_dbIdentity')]" }, "existingIdentities": { - "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '2024-11-01', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" + "value": "[if(equals(reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.type,'UserAssigned'),reference(resourceId('Microsoft.Compute/virtualMachines',concat(variables('const_managedVMPrefix'), copyIndex(1))), '${azure.apiVersionForVirtualMachines}', 'Full').identity.userAssignedIdentities, variables('obj_empty'))]" }, "location": { "value": "[parameters('location')]" @@ -191,7 +191,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "installJdbcLibsTemplate", "condition": "[or(equals(parameters('databaseType'),'mysql'), equals(parameters('databaseType'),'postgresql'))]", "dependsOn": [ @@ -245,7 +245,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "passwordlessDatasourceDeployment", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'installJdbcLibsTemplate')]" @@ -298,8 +298,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "fd30aea8-ec77-557b-ba12-4de15018a64a", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.pswless.database.end}", "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', 'passwordlessDatasourceDeployment')]" ], 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 0515b4ceb..1cb112af3 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 @@ -357,8 +357,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "22e98104-2229-5ec7-9a90-12edca3d88e7", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.cluster.start}", "properties": { "mode": "Incremental", "template": { @@ -371,8 +371,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "f6e45a7a-d491-58a1-a951-fad252e1a396", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.ssl.start}", "properties": { "mode": "Incremental", "template": { @@ -384,7 +384,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "type": "Microsoft.Network/networkSecurityGroups", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", @@ -435,7 +435,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorage}", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -447,7 +447,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPrivateEndpoint}", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", "location": "[parameters('location')]", @@ -474,7 +474,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -486,7 +486,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -497,7 +497,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'existing'),createObject(parameters('const_guidTag'),''),createObject())]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", @@ -514,7 +514,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", @@ -540,7 +540,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", @@ -575,7 +575,7 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -608,7 +608,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", @@ -655,7 +655,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -666,7 +666,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'),copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", @@ -692,14 +692,14 @@ ] }, "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')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0], ' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "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')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0], ' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "325d251a-fcba-5bd8-ad50-5682b3565ef5", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.ssl.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -715,8 +715,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "515d22ac-ff8c-5faa-aca1-3605ab5d2034", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.cluster.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -732,8 +732,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "cd48f178-52a3-415e-88bb-caa45f615b94", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -750,8 +750,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -768,8 +768,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -786,8 +786,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -804,8 +804,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -822,8 +822,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -840,8 +840,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "6637154a-06d2-4ac0-82ab-2a1d7e391eab", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -858,8 +858,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "060d9c3f-cc20-4380-a383-fd20594e5b2a", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -876,8 +876,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "3220431f-33d4-416a-8df7-a0fcc23a25e4", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -894,8 +894,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -912,8 +912,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -930,8 +930,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -948,8 +948,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0a52f317-8b40-4a77-9f3c-7607fc3ebfb7wls", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -966,8 +966,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "26ec5cf5-dd84-4764-97cf-4f830facbf66wls", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -984,8 +984,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "ada2e3e6-faef-4339-aaac-40bcdc4484ecwls", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -1016,15 +1016,15 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "storageAccountName": { "type": "string", 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 39c2adc21..c72937b6a 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 @@ -300,8 +300,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "22e98104-2229-5ec7-9a90-12edca3d88e7", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.cluster.start}", "properties": { "mode": "Incremental", "template": { @@ -313,7 +313,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "type": "Microsoft.Network/networkSecurityGroups", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[parameters('nsgName')]", @@ -364,7 +364,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorage}", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -376,7 +376,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPrivateEndpoint}", "name": "[variables('name_privateSaEndpoint')]", "type": "Microsoft.Network/privateEndpoints", "location": "[parameters('location')]", @@ -403,7 +403,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default')]", "dependsOn": [ "[variables('ref_storage')]" @@ -415,7 +415,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/fileServices/shares", - "apiVersion": "2025-01-01", + "apiVersion": "${azure.apiVersionForStorageFileService}", "name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]", "dependsOn": [ "[variables('ref_fileService')]", @@ -426,7 +426,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "tags": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'existing'),createObject(parameters('const_guidTag'),''),createObject())]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_publicIPAddress')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_publicIPAddress')))]", @@ -443,7 +443,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[variables('name_virtualNetwork')]", @@ -469,7 +469,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),variables('name_nic_with_pub_ip')),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_with_pub_ip')))]", @@ -504,7 +504,7 @@ }, { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]", "name": "[if(equals(copyIndex(),0),variables('name_outputAdminHost_without_pub_ip'),concat(variables('const_managedVMPrefix'), copyIndex(),variables('name_nic_without_pub_ip')))]", "location": "[parameters('location')]", @@ -537,7 +537,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[if(equals(copyIndex(),0),parameters('adminVMName'),concat(variables('const_managedVMPrefix'), copyIndex()))]", "location": "[parameters('location')]", @@ -584,7 +584,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -595,7 +595,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('const_managedVMPrefix'),copyIndex(),'/newuserscript'))]", "location": "[parameters('location')]", @@ -621,14 +621,14 @@ ] }, "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')), '2025-01-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '2023-06-01').customDnsConfigs[0].ipAddresses[0], ' ', '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')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0], ' ', 'false','\"')]" } } }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "515d22ac-ff8c-5faa-aca1-3605ab5d2034", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.cluster.end}", "dependsOn": [ "virtualMachineExtensionLoop" ], @@ -644,8 +644,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "cd48f178-52a3-415e-88bb-caa45f615b94", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -662,8 +662,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -680,8 +680,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -698,8 +698,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -716,8 +716,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol91}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -734,8 +734,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -752,8 +752,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "6637154a-06d2-4ac0-82ab-2a1d7e391eab", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -770,8 +770,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "060d9c3f-cc20-4380-a383-fd20594e5b2a", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -788,8 +788,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "3220431f-33d4-416a-8df7-a0fcc23a25e4", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -806,8 +806,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -824,8 +824,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -842,8 +842,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel87}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -860,8 +860,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0a52f317-8b40-4a77-9f3c-7607fc3ebfb7wls", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -878,8 +878,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "26ec5cf5-dd84-4764-97cf-4f830facbf66wls", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -896,8 +896,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "ada2e3e6-faef-4339-aaac-40bcdc4484ecwls", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel76}", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "virtualMachineExtensionLoop" @@ -928,15 +928,15 @@ }, "adminHostName": { "type": "string", - "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" + "value": "[if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn, reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress)]" }, "adminConsole": { "type": "string", - "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" + "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001/console/'),'')]" }, "adminSecuredConsole": { "type": "string", - "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '2023-06-01').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" + "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]" }, "storageAccountName": { "type": "string", 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 ef5436675..915359efa 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 @@ -322,8 +322,8 @@ ], "resources": [ { - "apiVersion": "2023-07-01", - "name": "157ea604-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.coherence.start}", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -336,7 +336,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('name_vmPrefix'),copyIndex(1),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -352,13 +352,13 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(variables('name_virtualNetwork'), '/', variables('name_subnet'))]", "condition": "[and(empty(variables('name_virtualNetwork')), empty(variables('name_subnet')))]" }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(variables('name_vmPrefix'), copyIndex(1), variables('name_nic'))]", "location": "[parameters('location')]", @@ -390,7 +390,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('name_vmPrefix'), copyIndex(1))]", "location": "[parameters('location')]", @@ -435,7 +435,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -448,7 +448,7 @@ { "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[if(equals(copyIndex(),0),concat(parameters('adminVMName'),'/newuserscript'),concat(variables('name_vmPrefix'), copyIndex(),'/newuserscript'))]", - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "location": "[parameters('location')]", "copy": { "name": "virtualMachineExtensionLoop", @@ -472,13 +472,13 @@ ] }, "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')), '2025-01-01').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'), ' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',parameters('sslCustomIdentityKeyStoreType'),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',parameters('sslCustomTrustKeyStoreType'),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" + "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')), '${azure.apiVersionForStorage}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'), ' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',parameters('sslCustomIdentityKeyStoreType'),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',parameters('sslCustomTrustKeyStoreType'),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]" } } }, { - "apiVersion": "2023-07-01", - "name": "157ea51e-12ae-11eb-adc1-0242ac120002", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.coherence.end}", "type": "Microsoft.Resources/deployments", "dependsOn": [ "virtualMachineExtensionLoop" 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 449a33e15..b29bde02a 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 @@ -134,7 +134,7 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "pswlessDbTemplate", "condition": "[parameters('enablePswlessConnection')]", "properties": { @@ -197,7 +197,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "upgradeMySQLJdbcDriverTemplate", "condition": "[and(not(parameters('enablePswlessConnection')), equals(parameters('databaseType'),'mysql'))]", "properties": { @@ -248,7 +248,7 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "passwordDatasourceDeployment", "condition": "[not(parameters('enablePswlessConnection'))]", "dependsOn": [ diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json index bd87c11cc..f40e26e1e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json @@ -105,8 +105,8 @@ }, "resources": [ { - "apiVersion": "2023-07-01", - "name": "c40d7aa8-9fe7-51c6-86de-27e1b1678735", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.dns.start}", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -119,7 +119,7 @@ } }, { - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "type": "Microsoft.Resources/deployments", "name": "createDNSZone", "condition": "[not(parameters('hasDNSZones'))]", @@ -155,7 +155,7 @@ } }, { - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "type": "Microsoft.Resources/deployments", "name": "updateDNSZone", "condition": "[parameters('hasDNSZones')]", @@ -206,8 +206,8 @@ } }, { - "apiVersion": "2023-07-01", - "name": "022d99e3-8ba3-5822-b6d5-bcec64518286", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${cluster.dns.end}", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json index c82c91e9b..e74edab2b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/nsgNestedTemplate.json @@ -29,7 +29,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsAllowed')]", "condition": "[not(parameters('denyPublicTrafficForAdminServer'))]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "TCP", "sourcePortRange": "*", @@ -48,7 +48,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogicAdminPortsDenied')]", "condition": "[parameters('denyPublicTrafficForAdminServer')]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -67,7 +67,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsAllowed')]", "condition": "[and(not(parameters('denyPublicTrafficForManagedServer')), parameters('enableOHS'))]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "*", "sourcePortRange": "*", @@ -85,7 +85,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "name": "[concat(parameters('networkSecurityGroupName'),'/','WebLogiManagedPortsDenied')]", "condition": "[and(parameters('denyPublicTrafficForManagedServer'), parameters('enableOHS'))]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "*", "sourcePortRange": "*", 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 a44de6275..d1c110e96 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 @@ -244,7 +244,7 @@ "type": "Microsoft.Network/networkSecurityGroups/securityRules", "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]", "name": "[concat(parameters('nsgName'),'/','OHSPorts')]", - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", "properties": { "protocol": "TCP", "sourcePortRange": "*", @@ -257,7 +257,7 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(parameters('ohsVMName'),variables('name_publicIPAddress'))]", "location": "[parameters('location')]", @@ -269,13 +269,13 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks/subnets", "name": "[concat(parameters('virtualNetworkName'), '/', variables('name_subnet'))]", "condition": "[and(empty(parameters('virtualNetworkName')), empty(variables('name_subnet')))]" }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", "name": "[concat(parameters('ohsVMName'), variables('name_nic'))]", "location": "[parameters('location')]", @@ -303,7 +303,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "name": "[parameters('ohsVMName')]", "location": "[parameters('location')]", @@ -344,7 +344,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', parameters('storageAccountName')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -355,7 +355,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('ohsVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -385,15 +385,15 @@ }, "ohsHostName": { "type": "string", - "value": "[reference(variables('name_outputOHSHost'), '2023-06-01').dnsSettings.fqdn]" + "value": "[reference(variables('name_outputOHSHost'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn]" }, "ohsAccessURL": { "type": "string", - "value": "[uri(format('http://{0}:{1}',reference(variables('name_outputOHSHost'), '2023-06-01').dnsSettings.fqdn,parameters('ohshttpPort')),'')]" + "value": "[uri(format('http://{0}:{1}',reference(variables('name_outputOHSHost'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,parameters('ohshttpPort')),'')]" }, "ohsSecureAccessURL": { "type": "string", - "value": "[uri(format('https://{0}:{1}',reference(variables('name_outputOHSHost'), '2023-06-01').dnsSettings.fqdn,parameters('ohshttpsPort')),'')]" + "value": "[uri(format('https://{0}:{1}',reference(variables('name_outputOHSHost'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,parameters('ohshttpsPort')),'')]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json index b26623dfc..37ed87e2f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentTemplate.json @@ -56,7 +56,7 @@ "resources": [ { "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", + "apiVersion": "${azure.apiVersionForDeploymentScript}", "name": "[concat('postdeployscript-', parameters('_globalResourceNameSuffix'))]", "kind": "AzureCLI", "location": "[parameters('location')]", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json index 2d568a7a8..359c76050 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/postDeploymentUAMIRolesTemplate.json @@ -30,13 +30,13 @@ "resources": [ { "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "apiVersion": "2023-01-31", + "apiVersion": "${azure.apiVersionForIdentity}", "name": "[variables('name_postDeploymentScriptUserDefinedManagedIdentity')]", "location": "[parameters('location')]" }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", + "apiVersion": "${azure.apiVersionForDeployment}", "name": "[variables('name_postDeploymentScriptRoleAssignment')]", "location": "[parameters('location')]", "subscriptionId": "[subscription().subscriptionId]", @@ -68,7 +68,7 @@ "resources": [ { "type": "Microsoft.Authorization/roleAssignments", - "apiVersion": "2022-04-01", + "apiVersion": "${azure.apiVersionForRoleAssignment}", "name": "[variables('roleAssignmentGuid')]", "properties": { "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', parameters('innerRoleDefinitionId'))]", 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 e4bef0b4d..4677f1b92 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 @@ -101,8 +101,8 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "931c2901-224a-5cc6-b235-41fa162b7532", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.deletenode.start}", "properties": { "mode": "Incremental", "template": { @@ -114,7 +114,7 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines/extensions", "name": "[concat(parameters('adminVMName'),'/newuserscript')]", "location": "[parameters('location')]", @@ -135,8 +135,8 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "3eb27f94-d1c3-572c-a7da-0d7f26f6a20e", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${dynamic.deletenode.end}", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json index 99a52dc59..88c20f542 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json @@ -94,7 +94,7 @@ "Standard_A0", "Basic_A0", "Standard_B1s", - "Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6" + ${azure.armBased.vmSize.list} ] }, "osPlatform": "Linux", @@ -306,13 +306,13 @@ "name": "tagsByResource", "type": "Microsoft.Common.TagsByResource", "resources": [ - "Microsoft.Compute/virtualMachines", - "Microsoft.Network/virtualNetworks", - "Microsoft.Network/networkInterfaces", - "Microsoft.Network/networkSecurityGroups", - "Microsoft.Network/publicIPAddresses", - "Microsoft.Storage/storageAccounts", - "Microsoft resources deployment" + "${identifier.virtualMachines}", + "${identifier.virtualNetworks}", + "${identifier.networkInterfaces}", + "${identifier.networkSecurityGroups}", + "${identifier.publicIPAddresses}", + "${identifier.storageAccounts}", + "${identifier.resourcesDeployment}" ], "toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer." } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json index a3afaa0be..190909ada 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json @@ -76,7 +76,7 @@ "type": "object", "defaultValue": {}, "metadata": { - "description": "Tags for the resources." + "description": "${label.tagsLabel}" } }, "usePreviewImage": { @@ -170,9 +170,9 @@ "resources": [ { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", - "name": "b446fe15-5d43-5549-858d-4775741cd0ba", + "apiVersion": "${azure.apiVersionForDeployment}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", + "name": "${start}", "properties": { "mode": "Incremental", "template": { @@ -184,8 +184,8 @@ }, { "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2023-06-01", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft.Network/networkSecurityGroups')]", + "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.networkSecurityGroups}')]", "name": "[variables('name_networkSecurityGroup')]", "location": "[parameters('location')]", "properties": { @@ -208,8 +208,8 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2025-01-01", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Storage/storageAccounts')]", + "apiVersion": "${azure.apiVersionForStorage}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.storageAccounts}')]", "name": "[variables('name_storageAccount')]", "location": "[parameters('location')]", "sku": { @@ -219,9 +219,9 @@ "properties": {} }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForPublicIPAddresses}", "type": "Microsoft.Network/publicIPAddresses", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.publicIPAddresses}')]", "name": "[variables('name_publicIPAddress')]", "location": "[parameters('location')]", "properties": { @@ -232,9 +232,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForVirtualNetworks}", "type": "Microsoft.Network/virtualNetworks", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualNetworks}')]", "name": "[variables('name_virtualNetwork')]", "location": "[parameters('location')]", "dependsOn": [ @@ -260,9 +260,9 @@ } }, { - "apiVersion": "2023-06-01", + "apiVersion": "${azure.apiVersionForNetworkInterfaces}", "type": "Microsoft.Network/networkInterfaces", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.networkInterfaces}')]", "name": "[variables('name_nic')]", "location": "[parameters('location')]", "dependsOn": [ @@ -290,9 +290,9 @@ } }, { - "apiVersion": "2024-11-01", + "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), 'Microsoft.Compute/virtualMachines')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]", "name": "[variables('name_vmName')]", "location": "[parameters('location')]", "dependsOn": [ @@ -334,7 +334,7 @@ "diagnosticsProfile": { "bootDiagnostics": { "enabled": true, - "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2025-01-01').primaryEndpoints.blob]" + "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersionForStorage}').primaryEndpoints.blob]" } } }, @@ -345,10 +345,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "pid-a63dea86-f8db-4e75-a231-1145d4f3ab6e-partnercenter", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${end}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], @@ -362,10 +362,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "6acfc3a0-6225-465f-9fa9-4d63ea81405b", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk21-ol94}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -381,10 +381,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "69146c30-9c7e-4ce2-8642-eb8eb1b23cc5", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk21-ol810}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -400,10 +400,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "a9a1c9b7-6c27-4086-b271-1ffd3c215390", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk17-ol94}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -419,10 +419,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "69b6b433-1679-4d37-af25-3d56987c217a", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141200-jdk17-ol810}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -438,10 +438,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "cd48f178-52a3-415e-88bb-caa45f615b94", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol91}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -457,10 +457,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "c8f1b07d-1660-4f6a-be97-3925645e8817", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol87}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -476,10 +476,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "76d4dbe8-0679-4772-ad2e-461fac83dfd7", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol91}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -495,10 +495,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "d58854b4-a612-4fbf-b095-f2d2178a88df", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol87}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -514,10 +514,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "2b7d87a9-981a-44af-bf71-b2b479841ed9", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol91}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -533,10 +533,10 @@ } }, { - "apiVersion": "2023-07-01", - "name": "f2ae4133-abd1-4711-ae74-aeb6e498f2c0", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol87}", "type": "Microsoft.Resources/deployments", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -553,9 +553,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "6637154a-06d2-4ac0-82ab-2a1d7e391eab", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-ol76}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -572,9 +572,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "060d9c3f-cc20-4380-a383-fd20594e5b2a", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-ol76}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -591,9 +591,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "3220431f-33d4-416a-8df7-a0fcc23a25e4", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-ol76}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -610,9 +610,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0799976a-84a5-4a59-b74b-bd67c4d37aa5", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel87}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -629,9 +629,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "2e471204-8cbe-4aec-9c64-4d0f5f8d590d", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel87}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -648,9 +648,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "b1f76ba8-078d-43bc-b35c-9a4952eb00c9", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel87}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -667,9 +667,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "0a52f317-8b40-4a77-9f3c-7607fc3ebfb7wls", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-122140-jdk8-rhel76}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -686,9 +686,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "26ec5cf5-dd84-4764-97cf-4f830facbf66wls", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk8-rhel76}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" @@ -705,9 +705,9 @@ }, { "type": "Microsoft.Resources/deployments", - "apiVersion": "2023-07-01", - "name": "ada2e3e6-faef-4339-aaac-40bcdc4484ecwls", - "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'Microsoft resources deployment')]", + "apiVersion": "${azure.apiVersionForDeployment}", + "name": "${from.owls-141100-jdk11-rhel76}", + "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" From b8d24186e3fbef18a49f0cd5f595ba85ccc9b433 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Mon, 29 Sep 2025 08:13:44 +0000 Subject: [PATCH 5/5] Changes related to outbound Access for WLS on AKS Offer --- .../src/main/arm/scripts/createVMAndBuildImage.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh index 5aec0d499..8f1820887 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh @@ -53,11 +53,20 @@ function cleanup_vm() { | where resourceGroup =~ '${CURRENT_RESOURCEGROUP_NAME}' \ | project nsgId = id" --query "data[0].nsgId" -o tsv) + #query public ip id + publicIpId=$(az graph query -q "Resources \ +| where type =~ 'Microsoft.Network/publicIPAddresses' \ +| where name =~ '${vmName}PublicIP' \ +| where resourceGroup =~ '${CURRENT_RESOURCEGROUP_NAME}' \ +| project publicIpId = id" --query "data[0].publicIpId" -o tsv) + # Delete VM NIC IP VNET NSG resoruces echo "deleting vm ${vmId}" az vm delete --ids $vmId --yes echo "deleting nic ${nicId}" az network nic delete --ids ${nicId} + echo "deleting public ip ${publicIpId}" + az network public-ip delete --ids $publicIpId echo "deleting disk ${osDiskId}" az disk delete --yes --ids ${osDiskId} echo "deleting vnet ${vnetId}" @@ -119,6 +128,8 @@ function build_docker_image() { export TAG_VM=$(echo "${TAG_VM}" \ | jq -r 'to_entries | map("\"" + .key + "\"=" + (if .value|type == "string" then "\"\(.value)\"" else "\(.value)" end)) | join(" ")') + publicIPName="${vmName}PublicIP" + # MICROSOFT_INTERNAL # Specify tag 'SkipASMAzSecPack' to skip policy 'linuxazuresecuritypackautodeployiaas_1.6' # Specify tag 'SkipNRMS*' to skip Microsoft internal NRMS policy, which causes vm-redeployed issue @@ -132,7 +143,7 @@ function build_docker_image() { --enable-agent true \ --vnet-name ${vmName}VNET \ --enable-auto-update false \ - --public-ip-address "" \ + --public-ip-address ${publicIPName} \ --size ${vmSize} \ --tags ${TAG_VM} SkipASMAzSecPack=true SkipNRMSCorp=true SkipNRMSDatabricks=true SkipNRMSDB=true SkipNRMSHigh=true SkipNRMSMedium=true SkipNRMSRDPSSH=true SkipNRMSSAW=true SkipNRMSMgmt=true --verbose