From 0cce9a78d90d54253dd5efe579ffde2238ff0db7 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Wed, 21 Feb 2024 10:05:53 +0530 Subject: [PATCH] Fix secret generation for mutual ssl config --- .../main/java/io/ballerina/c2c/tasks/C2CAnalysisTask.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/C2CAnalysisTask.java b/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/C2CAnalysisTask.java index 610f8d6e..f83bd443 100644 --- a/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/C2CAnalysisTask.java +++ b/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/C2CAnalysisTask.java @@ -124,6 +124,9 @@ private void addClientList(List clientInfoList) throws KubernetesPlu final Optional mutualSSLConfig = clientInfo.getHttpsConfig().getMutualSSLConfig(); if (mutualSSLConfig.isPresent()) { String sslCertPath = mutualSSLConfig.get().getPath(); + if (KubernetesUtils.isBlank(sslCertPath)) { + continue; + } String sslCertPathContent = readSecretFile(sslCertPath); SecretModel secretModel; Optional existing = getSecretByMountPathExists(getMountPath(sslCertPath)); @@ -216,7 +219,7 @@ private Set processSecureSocketConfig(ListenerInfo listenerInfo) th if (secureSocketConfig.isPresent()) { String path = secureSocketConfig.get().getPath(); final String validName = getValidName(listenerInfo.getName()); - if (path != null && !"".equals(path)) { + if (!KubernetesUtils.isBlank(path)) { String keyStoreContent = readSecretFile(path); secretModel.setName(validName + "-secure-socket"); secretModel.setMountPath(getMountPath(path)); @@ -258,6 +261,9 @@ private Set processSecureSocketConfig(ListenerInfo listenerInfo) th } if (mutualSSLConfig.isPresent()) { String sslCertPath = mutualSSLConfig.get().getPath(); + if (KubernetesUtils.isBlank(sslCertPath)) { + return secrets; + } String sslCertPathContent = readSecretFile(sslCertPath); if (getMountPath(sslCertPath).equals(secretModel.getMountPath())) { // Same mount path as key config add data to existing secret.