Skip to content

Commit 4d150c5

Browse files
gnsuryangnsuryan
committed
Revert "hard-code pids for passwordchange-test"
This reverts commit 4bff3fd.
1 parent 319c86f commit 4d150c5

File tree

100 files changed

+1149
-1149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1149
-1149
lines changed

‎weblogic-azure-aks/src/main/arm/createUiDefinition.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,22 +2078,22 @@
20782078
"name": "tagsByResource",
20792079
"type": "Microsoft.Common.TagsByResource",
20802080
"resources": [
2081-
"Microsoft.ContainerService/managedClusters",
2082-
"Microsoft.Network/applicationGateways",
2083-
"Microsoft.ContainerRegistry/registries",
2084-
"Microsoft.Compute/virtualMachines",
2085-
"Virtual machine extension",
2086-
"Microsoft.Network/virtualNetworks",
2087-
"Microsoft.Network/networkInterfaces",
2088-
"Microsoft.Network/networkSecurityGroups",
2089-
"Microsoft.Network/publicIPAddresses",
2090-
"Microsoft.Storage/storageAccounts",
2091-
"Microsoft.KeyVault/vaults",
2092-
"Microsoft.ManagedIdentity/userAssignedIdentities",
2093-
"Microsoft.Network/dnszones",
2094-
"Microsoft.OperationalInsights/workspaces",
2095-
"Microsoft.Monitor/accounts",
2096-
"Microsoft.Resources/deploymentScripts"
2081+
"${identifier.managedClusters}",
2082+
"${identifier.applicationGateways}",
2083+
"${identifier.registries}",
2084+
"${identifier.virtualMachines}",
2085+
"${identifier.virtualMachinesExtensions}",
2086+
"${identifier.virtualNetworks}",
2087+
"${identifier.networkInterfaces}",
2088+
"${identifier.networkSecurityGroups}",
2089+
"${identifier.publicIPAddresses}",
2090+
"${identifier.storageAccounts}",
2091+
"${identifier.vaults}",
2092+
"${identifier.userAssignedIdentities}",
2093+
"${identifier.dnszones}",
2094+
"${identifier.workspaces}",
2095+
"${identifier.accounts}",
2096+
"${identifier.deploymentScripts}"
20972097
],
20982098
"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."
20992099
}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ param sslUploadedPrivateKeyAlias string = newGuid()
199199
@secure()
200200
@description('Password of the private key')
201201
param sslUploadedPrivateKeyPassPhrase string = newGuid()
202-
@description('Tags for the resources.')
202+
@description('${label.tagsLabel}')
203203
param tagsByResource object = {}
204204
@description('Public port of the custom T3 channel in admin server')
205205
param t3ChannelAdminPort int = 7005
@@ -266,22 +266,22 @@ var _enableAppGWIngress = enableAppGWIngress
266266
// We can streamline the following code with a user-defined function, but it is not supported in Partner Center.
267267
// For status, see https://dev.azure.com/edburns-msft/Open%20Standard%20Enterprise%20Java%20(Java%20EE)%20on%20Azure/_workitems/edit/6219
268268
var _objTagsByResource = {
269-
'Microsoft.Monitor/accounts': contains(tagsByResource, 'Microsoft.Monitor/accounts') ? tagsByResource['Microsoft.Monitor/accounts'] : json('{}')
270-
'Microsoft.ContainerService/managedClusters': contains(tagsByResource, 'Microsoft.ContainerService/managedClusters') ? tagsByResource['Microsoft.ContainerService/managedClusters'] : json('{}')
271-
'Microsoft.Network/applicationGateways': contains(tagsByResource, 'Microsoft.Network/applicationGateways') ? tagsByResource['Microsoft.Network/applicationGateways'] : json('{}')
272-
'Microsoft.ContainerRegistry/registries': contains(tagsByResource, 'Microsoft.ContainerRegistry/registries') ? tagsByResource['Microsoft.ContainerRegistry/registries'] : json('{}')
273-
'Microsoft.Compute/virtualMachines': contains(tagsByResource, 'Microsoft.Compute/virtualMachines') ? tagsByResource['Microsoft.Compute/virtualMachines'] : json('{}')
274-
'Virtual machine extension': contains(tagsByResource, 'Virtual machine extension') ? tagsByResource['Virtual machine extension'] : json('{}')
275-
'Microsoft.Network/virtualNetworks': contains(tagsByResource, 'Microsoft.Network/virtualNetworks') ? tagsByResource['Microsoft.Network/virtualNetworks'] : json('{}')
276-
'Microsoft.Network/networkInterfaces': contains(tagsByResource, 'Microsoft.Network/networkInterfaces') ? tagsByResource['Microsoft.Network/networkInterfaces'] : json('{}')
277-
'Microsoft.Network/networkSecurityGroups': contains(tagsByResource, 'Microsoft.Network/networkSecurityGroups') ? tagsByResource['Microsoft.Network/networkSecurityGroups'] : json('{}')
278-
'Microsoft.Network/publicIPAddresses': contains(tagsByResource, 'Microsoft.Network/publicIPAddresses') ? tagsByResource['Microsoft.Network/publicIPAddresses'] : json('{}')
279-
'Microsoft.Storage/storageAccounts': contains(tagsByResource, 'Microsoft.Storage/storageAccounts') ? tagsByResource['Microsoft.Storage/storageAccounts'] : json('{}')
280-
'Microsoft.KeyVault/vaults': contains(tagsByResource, 'Microsoft.KeyVault/vaults') ? tagsByResource['Microsoft.KeyVault/vaults'] : json('{}')
281-
'Microsoft.ManagedIdentity/userAssignedIdentities': contains(tagsByResource, 'Microsoft.ManagedIdentity/userAssignedIdentities') ? tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] : json('{}')
282-
'Microsoft.Network/dnszones': contains(tagsByResource, 'Microsoft.Network/dnszones') ? tagsByResource['Microsoft.Network/dnszones'] : json('{}')
283-
'Microsoft.OperationalInsights/workspaces': contains(tagsByResource, 'Microsoft.OperationalInsights/workspaces') ? tagsByResource['Microsoft.OperationalInsights/workspaces'] : json('{}')
284-
'Microsoft.Resources/deploymentScripts': contains(tagsByResource, 'Microsoft.Resources/deploymentScripts') ? tagsByResource['Microsoft.Resources/deploymentScripts'] : json('{}')
269+
'${identifier.accounts}': contains(tagsByResource, '${identifier.accounts}') ? tagsByResource['${identifier.accounts}'] : json('{}')
270+
'${identifier.managedClusters}': contains(tagsByResource, '${identifier.managedClusters}') ? tagsByResource['${identifier.managedClusters}'] : json('{}')
271+
'${identifier.applicationGateways}': contains(tagsByResource, '${identifier.applicationGateways}') ? tagsByResource['${identifier.applicationGateways}'] : json('{}')
272+
'${identifier.registries}': contains(tagsByResource, '${identifier.registries}') ? tagsByResource['${identifier.registries}'] : json('{}')
273+
'${identifier.virtualMachines}': contains(tagsByResource, '${identifier.virtualMachines}') ? tagsByResource['${identifier.virtualMachines}'] : json('{}')
274+
'${identifier.virtualMachinesExtensions}': contains(tagsByResource, '${identifier.virtualMachinesExtensions}') ? tagsByResource['${identifier.virtualMachinesExtensions}'] : json('{}')
275+
'${identifier.virtualNetworks}': contains(tagsByResource, '${identifier.virtualNetworks}') ? tagsByResource['${identifier.virtualNetworks}'] : json('{}')
276+
'${identifier.networkInterfaces}': contains(tagsByResource, '${identifier.networkInterfaces}') ? tagsByResource['${identifier.networkInterfaces}'] : json('{}')
277+
'${identifier.networkSecurityGroups}': contains(tagsByResource, '${identifier.networkSecurityGroups}') ? tagsByResource['${identifier.networkSecurityGroups}'] : json('{}')
278+
'${identifier.publicIPAddresses}': contains(tagsByResource, '${identifier.publicIPAddresses}') ? tagsByResource['${identifier.publicIPAddresses}'] : json('{}')
279+
'${identifier.storageAccounts}': contains(tagsByResource, '${identifier.storageAccounts}') ? tagsByResource['${identifier.storageAccounts}'] : json('{}')
280+
'${identifier.vaults}': contains(tagsByResource, '${identifier.vaults}') ? tagsByResource['${identifier.vaults}'] : json('{}')
281+
'${identifier.userAssignedIdentities}': contains(tagsByResource, '${identifier.userAssignedIdentities}') ? tagsByResource['${identifier.userAssignedIdentities}'] : json('{}')
282+
'${identifier.dnszones}': contains(tagsByResource, '${identifier.dnszones}') ? tagsByResource['${identifier.dnszones}'] : json('{}')
283+
'${identifier.workspaces}': contains(tagsByResource, '${identifier.workspaces}') ? tagsByResource['${identifier.workspaces}'] : json('{}')
284+
'${identifier.deploymentScripts}': contains(tagsByResource, '${identifier.deploymentScripts}') ? tagsByResource['${identifier.deploymentScripts}'] : json('{}')
285285
}
286286
var const_aksName = createAKSCluster ? 'wlsonaks${const_globalResourceNameSuffix}' : aksClusterName
287287
var const_appGatewaySSLCertOptionGenerateCert = 'generateCert'

‎weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ param trustedRootCertificateDeploymentName string
3232
@secure()
3333
param vnetForApplicationGateway object
3434
param vnetRGNameForApplicationGateway string
35-
@description('Tags for the resources.')
35+
@description('${label.tagsLabel}')
3636
param tagsByResource object
3737

3838
// 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
5959
}
6060

6161
// get key vault object from a resource group
62-
resource existingKeyvault 'Microsoft.KeyVault/vaults@2024-11-01' existing = {
62+
resource existingKeyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' existing = {
6363
name: autoGeneratedSSLCertKeyVaultName
6464
}
6565

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
param acrName string
55
param location string
6-
@description('Tags for the resources.')
6+
@description('${label.tagsLabel}')
77
param tagsByResource object
88

9-
resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = {
9+
resource registries 'Microsoft.ContainerRegistry/registries@${azure.apiVersionForContainerRegistries}' = {
1010
name: acrName
1111
location: location
1212
sku: {
@@ -37,7 +37,7 @@ resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = {
3737
zoneRedundancy: 'Disabled'
3838
anonymousPullEnabled: false
3939
}
40-
tags: tagsByResource['Microsoft.ContainerRegistry/registries']
40+
tags: tagsByResource['${identifier.registries}']
4141
}
4242

4343
output acrName string = acrName

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ param aksVersion string = 'default'
2525
@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.')
2626
param enableAzureMonitoring bool = false
2727
param location string
28-
@description('Tags for the resources.')
28+
@description('${label.tagsLabel}')
2929
param tagsByResource object
3030
param utcValue string = utcNow()
3131

@@ -42,10 +42,10 @@ var obj_aciEnableOmsAgent = {
4242
}
4343
}
4444

45-
resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = if (enableAzureMonitoring) {
45+
resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@${azure.apiVersionForInsightsWorkspaces}' = if (enableAzureMonitoring) {
4646
name: name_aciWorkspace
4747
location: location
48-
tags: tagsByResource['Microsoft.OperationalInsights/workspaces']
48+
tags: tagsByResource['${identifier.workspaces}']
4949
properties: {
5050
sku: {
5151
name: aciWorkspaceSku
@@ -59,10 +59,10 @@ resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022
5959
}
6060
}
6161

62-
resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = {
62+
resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = {
6363
name: aksClusterName
6464
location: location
65-
tags: tagsByResource['Microsoft.ContainerService/managedClusters']
65+
tags: tagsByResource['${identifier.managedClusters}']
6666
properties: {
6767
kubernetesVersion: aksVersion
6868
dnsPrefix: '${aksClusterName}-dns'
@@ -81,7 +81,7 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = {
8181
availabilityZones: agentAvailabilityZones
8282
mode: 'System'
8383
osType: 'Linux'
84-
tags: tagsByResource['Microsoft.ContainerService/managedClusters']
84+
tags: tagsByResource['${identifier.managedClusters}']
8585
}
8686
]
8787
addonProfiles: {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param location string
1212

1313
var const_APIVersion = '2022-01-31-PREVIEW'
1414

15-
resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@2023-08-01' = {
15+
resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = {
1616
name: aksClusterName
1717
location: location
1818
properties: {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ param staticPrivateFrontentIP string = '10.0.0.1'
2020
@secure()
2121
param trustedRootCertData string = newGuid()
2222
param usePrivateIP bool = false
23-
@description('Tags for the resources.')
23+
@description('${label.tagsLabel}')
2424
param tagsByResource object
2525
param utcValue string = utcNow()
2626

@@ -80,13 +80,13 @@ var obj_tagIngress = {
8080
'managed-by-k8s-ingress': 'true'
8181
}
8282

83-
resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = {
83+
resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@${azure.apiVersionForPublicIPAddresses}' = {
8484
name: gatewayPublicIPAddressName
8585
sku: {
8686
name: 'Standard'
8787
}
8888
location: location
89-
tags: tagsByResource['Microsoft.Network/publicIPAddresses']
89+
tags: tagsByResource['${identifier.publicIPAddresses}']
9090
properties: {
9191
publicIPAllocationMethod: 'Static'
9292
dnsSettings: {
@@ -95,10 +95,10 @@ resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = {
9595
}
9696
}
9797

98-
resource wafv2AppGateway 'Microsoft.Network/applicationGateways@2023-06-01' = {
98+
resource wafv2AppGateway 'Microsoft.Network/applicationGateways@${azure.apiVersionForApplicationGateways}' = {
9999
name: gatewayName
100100
location: location
101-
tags: union(tagsByResource['Microsoft.Network/applicationGateways'], obj_tagIngress)
101+
tags: union(tagsByResource['${identifier.applicationGateways}'], obj_tagIngress)
102102
properties: {
103103
sku: {
104104
name: 'WAF_v2'

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ param sku string = 'Standard'
2828

2929
@description('Subject name to create a new certificate, example: \'CN=contoso.com\'.')
3030
param subjectName string = 'contoso.xyz'
31-
@description('Tags for the resources.')
31+
@description('${label.tagsLabel}')
3232
param tagsByResource object
3333
param utcValue string = utcNow()
3434

@@ -37,10 +37,10 @@ var obj_extraTag= {
3737
}
3838
var const_identityId = '${substring(string(identity.userAssignedIdentities), indexOf(string(identity.userAssignedIdentities), '"') + 1, lastIndexOf(string(identity.userAssignedIdentities), '"') - (indexOf(string(identity.userAssignedIdentities), '"') + 1))}'
3939

40-
resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = {
40+
resource keyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' = {
4141
name: keyVaultName
4242
location: location
43-
tags: union(tagsByResource['Microsoft.KeyVault/vaults'], obj_extraTag)
43+
tags: union(tagsByResource['${identifier.vaults}'], obj_extraTag)
4444
properties: {
4545
sku: {
4646
family: 'A'
@@ -63,15 +63,15 @@ resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = {
6363
}
6464
}
6565

66-
resource createAddCertificate 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
66+
resource createAddCertificate 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = {
6767
name: 'ds-create-add-appgw-certificate-${_globalResourceNameSuffix}'
6868
location: location
6969
identity: identity
7070
kind: 'AzurePowerShell'
71-
tags: tagsByResource['Microsoft.Resources/deploymentScripts']
71+
tags: tagsByResource['${identifier.deploymentScripts}']
7272
properties: {
7373
forceUpdateTag: utcValue
74-
azPowerShellVersion: '11.5'
74+
azPowerShellVersion: '${azure.powershell.version}'
7575
timeout: 'PT30M'
7676
arguments: ' -vaultName ${keyVaultName} -certificateName ${secretName} -subjectName ${subjectName}'
7777
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 '

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@description('Azure DNS Zone name.')
22
param dnszoneName string
3-
@description('Tags for the resources.')
3+
@description('${label.tagsLabel}')
44
param tagsByResource object
55

6-
resource dnszoneName_resource 'Microsoft.Network/dnszones@2023-07-01-preview' = {
6+
resource dnszoneName_resource 'Microsoft.Network/dnszones@${azure.apiVersionForDNSZone}' = {
77
name: dnszoneName
88
location: 'global'
9-
tags: tagsByResource['Microsoft.Network/dnszones']
9+
tags: tagsByResource['${identifier.dnszones}']
1010
properties: {
1111
zoneType: 'Public'
1212
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
param fileShareName string
55
param location string
66
param storageAccountName string = 'stg-contoso'
7-
@description('Tags for the resources.')
7+
@description('${label.tagsLabel}')
88
param tagsByResource object
99
param utcValue string = utcNow()
1010

@@ -14,11 +14,11 @@ var obj_extraTag = {
1414
'created-by-azure-weblogic': utcValue
1515
}
1616

17-
resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = {
17+
resource storageAccount 'Microsoft.Storage/storageAccounts@${azure.apiVersionForStorage}' = {
1818
name: storageAccountName
1919
location: location
2020
kind: 'StorageV2'
21-
tags: union(tagsByResource['Microsoft.Storage/storageAccounts'], obj_extraTag)
21+
tags: union(tagsByResource['${identifier.storageAccounts}'], obj_extraTag)
2222
sku: {
2323
name: const_sku
2424
tier: 'Standard'
@@ -42,7 +42,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = {
4242
}
4343
}
4444

45-
resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@2025-01-01' = {
45+
resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@${azure.apiVersionForStorageFileService}' = {
4646
name: '${storageAccount.name}/default/${fileShareName}'
4747
properties: {
4848
accessTier: 'TransactionOptimized'

0 commit comments

Comments
 (0)