Skip to content

Commit cbf3458

Browse files
committed
On branchc e2etest: take "." "_" "(" ")" from gateway dns name that introduced by resource group name.
Signed-off-by: galiacheng <[email protected]> Changes to be committed: modified: weblogic-azure-aks/src/main/bicep/mainTemplate.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep
1 parent d21ac96 commit cbf3458

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

weblogic-azure-aks/src/main/bicep/mainTemplate.bicep

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,13 @@ var const_wlsJavaOptions = wlsJavaOption == '' ? 'null' : wlsJavaOption
260260
var const_wlsSSLCertOptionKeyVault = 'keyVaultStoredConfig'
261261
var name_defaultPidDeployment = 'pid'
262262
var name_dnsNameforApplicationGateway = '${concat(dnsNameforApplicationGateway, take(utcValue, 6))}'
263-
var name_domainLabelforApplicationGateway = '${take(concat(name_dnsNameforApplicationGateway, '-', toLower(resourceGroup().name), '-', toLower(wlsDomainName)), 63)}'
263+
var name_domainLabelforApplicationGateway = '${take(concat(name_dnsNameforApplicationGateway, '-', toLower(name_rgNameWithoutSpecialCharacter), '-', toLower(wlsDomainName)), 63)}'
264264
var name_identityKeyStoreDataSecret = (sslConfigurationAccessOption == const_wlsSSLCertOptionKeyVault) ? sslKeyVaultCustomIdentityKeyStoreDataSecretName : 'myIdentityKeyStoreData'
265265
var name_identityKeyStorePswSecret = (sslConfigurationAccessOption == const_wlsSSLCertOptionKeyVault) ? sslKeyVaultCustomIdentityKeyStorePassPhraseSecretName : 'myIdentityKeyStorePsw'
266266
var name_keyVaultName = empty(const_keyvaultNameFromTag) ? '${take(concat('wls-kv', uniqueString(utcValue)), 24)}' : resourceGroup().tags.wlsKeyVault
267267
var name_privateKeyAliasSecret = (sslConfigurationAccessOption == const_wlsSSLCertOptionKeyVault) ? sslKeyVaultPrivateKeyAliasSecretName : 'privateKeyAlias'
268268
var name_privateKeyPswSecret = (sslConfigurationAccessOption == const_wlsSSLCertOptionKeyVault) ? sslKeyVaultPrivateKeyPassPhraseSecretName : 'privateKeyPsw'
269+
var name_rgNameWithoutSpecialCharacter= replace(replace(replace(replace(resourceGroup().name, '.', ''), '(', ''), ')', ''), '_', '') // remove . () _ from resource group name
269270
var name_rgKeyvaultForWLSSSL = (sslConfigurationAccessOption == const_wlsSSLCertOptionKeyVault) ? sslKeyVaultResourceGroup : resourceGroup().name
270271
var name_storageAccountName = const_hasStorageAccount ? reference('query-existing-storage-account').outputs.storageAccount.value : 'wls${uniqueString(utcValue)}'
271272
var name_tagNameForKeyVault = 'wlsKeyVault'

weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
@description('DNS for ApplicationGateway')
5-
param dnsNameforApplicationGateway string = take('wlsgw${uniqueString(utcValue)}-${toLower(resourceGroup().name)}', 63)
5+
param dnsNameforApplicationGateway string = take('wlsgw${uniqueString(utcValue)}', 63)
66
@description('Public IP Name for the Application Gateway')
77
param gatewayPublicIPAddressName string = 'gwip'
88
param utcValue string = utcNow()

0 commit comments

Comments
 (0)