From fd18516541f3f1c7b9aafdac98d1fcf39dd68cdd Mon Sep 17 00:00:00 2001 From: nisanharamati Date: Tue, 8 Oct 2019 11:00:12 -0700 Subject: [PATCH] fix(Kayenta): Change exception type to kork.UserException (#3218) * fix(Kayenta): Change exception type to kork.UserException --- .../orca/kayenta/tasks/ResolveKayentaConfigIdTask.kt | 5 +++-- .../spinnaker/orca/kayenta/tasks/RunKayentaCanaryTask.kt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/ResolveKayentaConfigIdTask.kt b/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/ResolveKayentaConfigIdTask.kt index d471220496..fcfcfd936a 100644 --- a/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/ResolveKayentaConfigIdTask.kt +++ b/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/ResolveKayentaConfigIdTask.kt @@ -1,5 +1,6 @@ package com.netflix.spinnaker.orca.kayenta.tasks +import com.netflix.spinnaker.kork.exceptions.UserException import com.netflix.spinnaker.orca.ExecutionStatus.SUCCEEDED import com.netflix.spinnaker.orca.Task import com.netflix.spinnaker.orca.TaskResult @@ -25,9 +26,9 @@ class ResolveKayentaConfigIdTask( .toList() if (candidates.size == 0) { - throw NoSuchElementException("Couldn't find a configId for configName $configName and application $currentApplication") + throw UserException("Couldn't find a canary configId for configName $configName and application $currentApplication") } else if (candidates.size > 1) { - throw IllegalArgumentException("Found more than one configId for configName $configName and application $currentApplication") + throw UserException("Found more than one canary configId for configName $configName and application $currentApplication") } return TaskResult.builder(SUCCEEDED).context("canaryConfigId", candidates[0].id).build() } diff --git a/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/RunKayentaCanaryTask.kt b/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/RunKayentaCanaryTask.kt index 19b334f468..0766b60115 100644 --- a/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/RunKayentaCanaryTask.kt +++ b/orca-kayenta/src/main/kotlin/com/netflix/spinnaker/orca/kayenta/tasks/RunKayentaCanaryTask.kt @@ -16,6 +16,7 @@ package com.netflix.spinnaker.orca.kayenta.tasks +import com.netflix.spinnaker.kork.exceptions.UserException import com.netflix.spinnaker.orca.ExecutionStatus.SUCCEEDED import com.netflix.spinnaker.orca.Task import com.netflix.spinnaker.orca.TaskResult @@ -38,7 +39,7 @@ class RunKayentaCanaryTask( val context = stage.mapTo() if (context.canaryConfigId.isNullOrEmpty()) { - throw IllegalArgumentException("Invalid canaryConfigId. Was the correct configName or configId used?") + throw UserException("Invalid canaryConfigId. Was the correct configName or configId used?") } val canaryPipelineExecutionId = kayentaService.create(