summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2023-02-21 15:47:55 +0000
committerGerrit Code Review <gerrit@onap.org>2023-02-21 15:47:55 +0000
commit2ff25d234e92a8d9b692f9d346df0aa99ed54fb1 (patch)
tree4392e34cda3107e2edd6f6b890ae294e1e1eb846
parentb44b2609a010894a2c1d3211f7099aed6a45fe64 (diff)
parent22fbb432c8d68b407ecd2f8c978218f47623135e (diff)
Merge "Fix sonar security hotspot"
-rw-r--r--participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java
index 3233cdc06..b681ba91d 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java
@@ -29,9 +29,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import javax.ws.rs.core.Response;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
+import net.bytebuddy.implementation.bytecode.Throw;
import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
import org.onap.policy.clamp.acm.participant.intermediary.api.ParticipantIntermediaryApi;
import org.onap.policy.clamp.acm.participant.kubernetes.exception.ServiceException;
@@ -126,8 +128,13 @@ public class AutomationCompositionElementHandler implements AutomationCompositio
checkPodStatus(automationCompositionId, element.getId(), chartInfo,
config.uninitializedToPassiveTimeout, config.podStatusCheckInterval);
}
- } catch (ServiceException | CoderException | IOException | ExecutionException | InterruptedException e) {
+ } catch (ServiceException | CoderException | IOException e) {
LOGGER.warn("Installation of Helm chart failed", e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new PfModelException(Response.Status.BAD_REQUEST, "Error invoking ExecutorService ", e);
+ } catch (ExecutionException e) {
+ throw new PfModelException(Response.Status.BAD_REQUEST, "Error retrieving pod status result ", e);
}
}