Skip to content

Commit 6bd2328

Browse files
rjeberhardrjeberhard
authored
Merge pull request #313 from galiacheng/aad-rebanding
Replace Azure Active Directory with Microsoft Entra ID.
2 parents 5315d92 + bdc901b commit 6bd2328

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
215215
exit 1
216216
fi
217217

218-
# For SSL enabled causes AAD failure #225
218+
# For SSL enabled causes Entra ID failure #225
219219
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
220220

221-
echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
221+
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
222222

223223
sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore $customSSLTrustKeyStoreFile -storepass $customTrustKeyStorePassPhrase -alias aadtrust -file ${addsCertificate} -storetype $customTrustKeyStoreType
224224
else
225-
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
225+
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
226226
fi
227227
}
228228

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ function importAADCertificate()
268268
# import the key to java security
269269
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
270270

271-
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
271+
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
272272
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
273273
# JRE was removed since JDK 11.
274274
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -305,14 +305,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
305305
exit 1
306306
fi
307307

308-
# For SSL enabled causes AAD failure #225
308+
# For SSL enabled causes Entra ID failure #225
309309
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
310310

311-
echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
311+
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
312312

313313
sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
314314
else
315-
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
315+
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
316316
fi
317317
}
318318

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ function importAADCertificate()
622622
{
623623
# import the key to java security
624624
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
625-
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
625+
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
626626
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
627627
# JRE was removed since JDK 11.
628628
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -658,14 +658,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
658658
exit 1
659659
fi
660660

661-
# For SSL enabled causes AAD failure #225
661+
# For SSL enabled causes Entra ID failure #225
662662
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
663663

664-
echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
664+
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
665665

666666
sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore {KEYSTORE_PATH}/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
667667
else
668-
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
668+
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
669669
fi
670670
}
671671

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2021, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
# Description
4-
# This script is to configure AAD for WebLogic cluster domain.
4+
# This script is to configure Entra ID for WebLogic cluster domain.
55

66

77
#Function to output message to StdErr
@@ -304,7 +304,7 @@ function importAADCertificate()
304304
{
305305
# import the key to java security
306306
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
307-
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
307+
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
308308
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
309309
# JRE was removed since JDK 11.
310310
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -341,14 +341,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
341341
exit 1
342342
fi
343343

344-
# For SSL enabled causes AAD failure #225
344+
# For SSL enabled causes Entra ID failure #225
345345
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
346346

347-
echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
347+
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
348348

349349
sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
350350
else
351-
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
351+
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
352352
fi
353353
}
354354

@@ -414,7 +414,7 @@ EOF
414414
java $WLST_ARGS weblogic.WLST ${SCRIPT_PWD}/restart-managedServer.py
415415

416416
if [[ $? != 0 ]]; then
417-
echo "Error : Fail to restart managed server to sync up aad configuration."
417+
echo "Error : Fail to restart managed server to sync up Entra ID configuration."
418418
exit 1
419419
fi
420420
}

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2021, Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
# Description
6-
# This script is to generate test parameters for AAD and appgeateway testing.
6+
# This script is to generate test parameters for Entra ID and appgeateway testing.
77

88
#read arguments from stdin
99
read parametersPath repoPath testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2021, Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
# Description
6-
# This script is to generate test parameters for AAD testing.
6+
# This script is to generate test parameters for Entra ID testing.
77

88
#read arguments from stdin
99
read parametersPath repoPath testbranchName

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2021, Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
# Description
6-
# This script is to generate test parameters for database datasource, AAD and Appgateway testing.
6+
# This script is to generate test parameters for database datasource, Entra ID and Appgateway testing.
77

88
#read arguments from stdin
99
read parametersPath repoPath testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2021, Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
# Description
6-
# This script is to generate test parameters for database datasource and AAD testing.
6+
# This script is to generate test parameters for database datasource and Entra ID testing.
77

88
#read arguments from stdin
99
read parametersPath repoPath testbranchName

‎weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ function importAADCertificate()
522522
{
523523
# import the key to java security
524524
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
525-
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
525+
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
526526
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
527527
# JRE was removed since JDK 11.
528528
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -558,14 +558,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
558558
exit 1
559559
fi
560560
561-
# For SSL enabled causes AAD failure #225
561+
# For SSL enabled causes Entra ID failure #225
562562
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
563563
564-
echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
564+
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
565565
566566
sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore {KEYSTORE_PATH}/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
567567
else
568-
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
568+
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
569569
fi
570570
}
571571

‎weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ function importAADCertificate()
308308
{
309309
# import the key to java security
310310
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
311-
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
311+
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
312312
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
313313
# JRE was removed since JDK 11.
314314
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -345,14 +345,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
345345
exit 1
346346
fi
347347

348-
# For SSL enabled causes AAD failure #225
348+
# For SSL enabled causes Entra ID failure #225
349349
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
350350

351-
echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
351+
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
352352

353353
sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
354354
else
355-
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
355+
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
356356
fi
357357
}
358358

0 commit comments

Comments
 (0)