From e31b4ef7b2936b3a96086d98e27211603108c62d Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 19 Apr 2023 15:23:29 +0200 Subject: [PATCH] Fix CI: More Specific Error --- src/main/python/ddadevops/devops_image_build.py | 2 +- .../python/ddadevops/devops_terraform_build.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/python/ddadevops/devops_image_build.py b/src/main/python/ddadevops/devops_image_build.py index 7ef19f0..a5e6e65 100644 --- a/src/main/python/ddadevops/devops_image_build.py +++ b/src/main/python/ddadevops/devops_image_build.py @@ -37,7 +37,7 @@ class DevopsImageBuild(DevopsBuild): self.image_build_service = ImageBuildService() if not image: if not config: - raise Exception("Image parameters could not be set.") + raise ValueError("Image parameters could not be set.") super().__init__(project, config=config) image = Image( dockerhub_user=config["dockerhub_user"], diff --git a/src/main/python/ddadevops/devops_terraform_build.py b/src/main/python/ddadevops/devops_terraform_build.py index 9b47af5..f2019fb 100644 --- a/src/main/python/ddadevops/devops_terraform_build.py +++ b/src/main/python/ddadevops/devops_terraform_build.py @@ -138,7 +138,7 @@ class DevopsTerraformBuild(DevopsBuild): self.post_build() self.print_terraform_command(terraform) if return_code > 0: - raise Exception(return_code, "terraform error:", stderr) + raise RuntimeError(return_code, "terraform error:", stderr) def plan_fail_on_diff(self): terraform = self.init_client() @@ -148,9 +148,9 @@ class DevopsTerraformBuild(DevopsBuild): self.post_build() self.print_terraform_command(terraform) if return_code not in (0, 2): - raise Exception(return_code, "terraform error:", stderr) + raise RuntimeError(return_code, "terraform error:", stderr) if return_code == 2: - raise Exception(return_code, "diff in config found:", stderr) + raise RuntimeError(return_code, "diff in config found:", stderr) def apply(self, auto_approve=False): terraform = self.init_client() @@ -172,7 +172,7 @@ class DevopsTerraformBuild(DevopsBuild): self.post_build() self.print_terraform_command(terraform) if return_code > 0: - raise Exception(return_code, "terraform error:", stderr) + raise RuntimeError(return_code, "terraform error:", stderr) def refresh(self): terraform = self.init_client() @@ -183,7 +183,7 @@ class DevopsTerraformBuild(DevopsBuild): self.post_build() self.print_terraform_command(terraform) if return_code > 0: - raise Exception(return_code, "terraform error:", stderr) + raise RuntimeError(return_code, "terraform error:", stderr) def destroy(self, auto_approve=False): terraform = self.init_client() @@ -204,7 +204,7 @@ class DevopsTerraformBuild(DevopsBuild): self.post_build() self.print_terraform_command(terraform) if return_code > 0: - raise Exception(return_code, "terraform error:", stderr) + raise RuntimeError(return_code, "terraform error:", stderr) def tf_import(self, tf_import_name, tf_import_resource,): terraform = self.init_client() @@ -215,7 +215,7 @@ class DevopsTerraformBuild(DevopsBuild): self.post_build() self.print_terraform_command(terraform) if return_code > 0: - raise Exception(return_code, "terraform error:", stderr) + raise RuntimeError(return_code, "terraform error:", stderr) def print_terraform_command(self, terraform): if self.debug_print_terraform_command: