From 3d9ae165a7af375340aa9e9ea81baafb596ab20a Mon Sep 17 00:00:00 2001 From: conor-mcnally Date: Tue, 12 Mar 2024 16:48:22 +0000 Subject: [PATCH] Fix merge conflicts --- README.md | 4 ++-- .../rules/plugin_validators/docker_validator.py | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d477d8f9..d5863693 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,8 @@ be on your way to contributing! ## Changelog -* 2.47.16 - `HelpInputOutputValidator` - Update error message from `icon-plugin` to `insight-plugin` -* 2.47.15 - `TitleValidator` - Change validator to print all issues rather than break on the first +* 2.47.16 - `HelpInputOutputValidator` - Update error message from `icon-plugin` to `insight-plugin` | `DockerValidator` - Print full error message and change instances of `icon-plugin` to `insight-plugin` +* 2.47.15 - `TitleValidator` - Change validator to print all issues rather than break on the first * 2.47.14 - `OutputValidator` - Fix issue where `schema.py` files from the venv folder were being validated * 2.47.13 - `HelpInputOutputValidator` - Fix validator to change single quotes to double quotes when an input field uses list values so that it does not break * 2.47.12 - `VersionBumpValidator` - update validation for connection versions| Updated `GitPython` to version 3.1.41. diff --git a/icon_validator/rules/plugin_validators/docker_validator.py b/icon_validator/rules/plugin_validators/docker_validator.py index 77a13db0..02b1de27 100644 --- a/icon_validator/rules/plugin_validators/docker_validator.py +++ b/icon_validator/rules/plugin_validators/docker_validator.py @@ -23,13 +23,14 @@ def validate(self, spec): else: try: subprocess.check_call(build_image, stdout=fd, stderr=fd) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError as error: raise ValidationException("The plugin is either broken or the image might not be built." - "Please try 'icon-plugin build image' to rebuild the image." - "'icon-plugin run -c bash' will open a bash shell on the build container.") from e + "Please try 'make image' to rebuild the image." + "'insight-plugin shell' will open a bash shell on the build container." + f"Error:\n{error}") try: subprocess.check_call(run_image, stdout=fd, stderr=fd) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError as error: raise ValidationException("Docker failed at running info command. " - "Check your plugin code for run-time errors.") from e + f"Error:\n{error}")