From 1c5507b4c6c5e30032cd8bbaef9083319652065c Mon Sep 17 00:00:00 2001
From: gnsuryan <gurudutt.suryanarayana@oracle.com>
Date: Tue, 30 Sep 2025 18:42:35 +0000
Subject: [PATCH] fix arm-ttk validation errors in bicep files for WebLogic on
 AKS offer

---
 resources/azure-common.properties                               | 2 +-
 weblogic-azure-aks/src/main/bicep/mainTemplate.bicep            | 2 ++
 weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep     | 1 -
 .../main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep   | 1 -
 .../modules/_deployment-scripts/_ds-validate-parameters.bicep   | 1 +
 .../src/main/bicep/modules/_setupPasswordlessDBConnection.bicep | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/azure-common.properties b/resources/azure-common.properties
index 45d547e46..7eb83b106 100644
--- a/resources/azure-common.properties
+++ b/resources/azure-common.properties
@@ -14,7 +14,7 @@ azure.apiVersionForRoleDefinitions=2022-04-01
 # Microsoft.ContainerRegistry/registries
 azure.apiVersionForContainerRegistries=2023-07-01
 # Microsoft.ContainerService/managedClusters
-azure.apiVersionForManagedClusters=2023-08-01
+azure.apiVersionForManagedClusters=2023-10-01
 # Microsoft.Compute/availabilitySets
 azure.apiVersionForAvailabilitySets=2024-11-01
 # Microsoft.Compute/virtualMachines
diff --git a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep
index ee1320466..7b55fa2be 100644
--- a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep
+++ b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep
@@ -59,8 +59,10 @@ param appGatewayCertificateOption string = 'haveCert'
 @description('Public IP Name for the Application Gateway')
 param appGatewayPublicIPAddressName string = 'gwip'
 @description('The one-line, base64 string of the backend SSL root certificate data.')
+@secure()
 param appGatewaySSLBackendRootCertData string = newGuid()
 @description('The one-line, base64 string of the SSL certificate data.')
+@secure()
 param appGatewaySSLCertData string = newGuid()
 @secure()
 @description('The value of the password for the SSL Certificate')
diff --git a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep
index 3c35a64ce..e9b94c15a 100644
--- a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep
+++ b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep
@@ -29,7 +29,6 @@ param sslCertificateDeploymentName string
 @secure()
 param sslCertPswData string
 param trustedRootCertificateDeploymentName string
-@secure()
 param vnetForApplicationGateway object
 param vnetRGNameForApplicationGateway string
 @description('${label.tagsLabel}')
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..d08f3c1cc 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
@@ -21,7 +21,6 @@ param vnetForApplicationGateway object = {
 }
 @description('${label.tagsLabel}')
 param tagsByResource object
-param utcValue string = utcNow()
 
 var const_subnetAddressPrefixes = vnetForApplicationGateway.subnets.gatewaySubnet.addressPrefix
 var const_vnetAddressPrefixes = vnetForApplicationGateway.addressPrefixes
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..ee3ea5328 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
@@ -10,6 +10,7 @@ param aksClusterRGName string
 param aksClusterName string
 param aksVersion string = 'default'
 param appGatewayCertificateOption string
+@secure()
 param appGatewaySSLCertData string
 @secure()
 param appGatewaySSLCertPassword string
diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep
index 3b88c7872..b1c12d40d 100644
--- a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep
+++ b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep
@@ -142,7 +142,7 @@ module configDataSource '_deployment-scripts/_ds-datasource-connection.bicep' =
     dbConfigurationType: dbConfigurationType
     dbGlobalTranPro: dbGlobalTranPro
     dbUser: dbUser
-    dsConnectionURL: format('{0}{4}{1}{5}{2}={3}', const_connectionString, name_jdbcPlugins[databaseType], array_msiClientId[databaseType], reference(items(dbIdentity.userAssignedIdentities)[0].key, const_identityAPIVersion, 'full').properties.clientId, array_urlJoiner[databaseType], array_paramJoiner[databaseType])
+    dsConnectionURL: uri(uri(const_connectionString, '${array_urlJoiner[databaseType]}${name_jdbcPlugins[databaseType]}'), '${array_paramJoiner[databaseType]}${array_msiClientId[databaseType]}=${reference(items(dbIdentity.userAssignedIdentities)[0].key, const_identityAPIVersion, 'full').properties.clientId}')
     enablePswlessConnection: true
     identity: identity
     jdbcDataSourceName: jdbcDataSourceName