From 1e1c6a9509a63f52f6888bc88dcfda3107defbfe Mon Sep 17 00:00:00 2001 From: Saqib Perwaiz Date: Tue, 27 Aug 2024 12:21:20 +0530 Subject: [PATCH] INFRA-3388 | Saqib | Fixes checkstyle warnings --- .../portal/repository/ManifestRepository.java | 16 ++++++++-------- .../service/kubernetes/KubeOperationService.java | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/navi/infra/portal/repository/ManifestRepository.java b/src/main/java/com/navi/infra/portal/repository/ManifestRepository.java index 09930c0f..575c7690 100644 --- a/src/main/java/com/navi/infra/portal/repository/ManifestRepository.java +++ b/src/main/java/com/navi/infra/portal/repository/ManifestRepository.java @@ -29,14 +29,14 @@ public interface ManifestRepository extends JpaRepository { + "where lb.data ->> 'endpoint' = :endpoint ", nativeQuery = true) Optional findIdByEndpoint(String endpoint); - @Query(value = "SELECT " + - "CASE " + - "WHEN CAST(d.data AS jsonb) -> 'exposedPorts' @> CAST('[{\"name\": \"secondary-service-port\"}]' AS jsonb) THEN true " + - "ELSE false " + - "END as has_secondary_service_port " + - "FROM manifest m " + - "JOIN deployment d ON m.id = d.manifest_id " + - "WHERE m.id = :manifestId", nativeQuery = true) + @Query(value = "SELECT " + + "CASE " + + "WHEN CAST(d.data AS jsonb) -> 'exposedPorts' @> CAST('[{\"name\": \"secondary-service-port\"}]' AS jsonb) THEN true " + + "ELSE false " + + "END as has_secondary_service_port " + + "FROM manifest m " + + "JOIN deployment d ON m.id = d.manifest_id " + + "WHERE m.id = :manifestId", nativeQuery = true) boolean hasSecondaryServicePort(@Param("manifestId") Long manifestId); } diff --git a/src/main/java/com/navi/infra/portal/service/kubernetes/KubeOperationService.java b/src/main/java/com/navi/infra/portal/service/kubernetes/KubeOperationService.java index 91bbc591..75d9326c 100644 --- a/src/main/java/com/navi/infra/portal/service/kubernetes/KubeOperationService.java +++ b/src/main/java/com/navi/infra/portal/service/kubernetes/KubeOperationService.java @@ -266,10 +266,11 @@ public class KubeOperationService { } private void deleteExposedIngress(Long manifestId, KIngress resource) { - KIngress exposedIngress = new KIngress(resource.getName()+"-exposed", + KIngress exposedIngress = new KIngress(resource.getName() + "-exposed", resource.getNameSpace()); try { - log.info("Deleting additional exposed ingress {} ,manifestId={}", exposedIngress.getName(), manifestId); + log.info("Deleting additional exposed ingress {} ,manifestId={}", + exposedIngress.getName(), manifestId); kubeClient.deleteNamespacedObject(exposedIngress); } catch (ApiException e) { if (e.getCode() == HttpStatus.NOT_FOUND.value()) {