From 144d0245f2b96b6278d8029e3788d2737f058743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Sun, 16 Jun 2019 22:38:39 +0200 Subject: [PATCH] Improve execute groovy script error logging --- pkg/controller/jenkins/client/script.go | 6 +++--- pkg/controller/jenkins/client/script_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/jenkins/client/script.go b/pkg/controller/jenkins/client/script.go index 6da73946..6c66b8c9 100644 --- a/pkg/controller/jenkins/client/script.go +++ b/pkg/controller/jenkins/client/script.go @@ -30,15 +30,15 @@ func (jenkins *jenkins) executeScript(script string, verifier string) (string, e r, err := jenkins.Requester.Do(ar, &output, parameters) if err != nil { - return "", errors.Wrap(err, "couldn't execute groovy script") + return "", errors.Wrapf(err, "couldn't execute groovy script, logs '%s'", output) } if r.StatusCode != http.StatusOK { - return output, errors.Errorf("invalid status code '%d'", r.StatusCode) + return output, errors.Errorf("invalid status code '%d', logs '%s'", r.StatusCode, output) } if !strings.Contains(output, verifier) { - return output, errors.New("script execution failed") + return output, errors.Errorf("script execution failed, logs '%s'", output) } return output, nil diff --git a/pkg/controller/jenkins/client/script_test.go b/pkg/controller/jenkins/client/script_test.go index 5f6cdd28..202c084f 100644 --- a/pkg/controller/jenkins/client/script_test.go +++ b/pkg/controller/jenkins/client/script_test.go @@ -62,7 +62,7 @@ func Test_ExecuteScript(t *testing.T) { script := "some groovy code" logs, err := jenkinsClient.executeScript(script, verifier) - assert.EqualError(t, err, "script execution failed", logs) + assert.EqualError(t, err, "script execution failed, logs 'some exception stack trace without verifier'", logs) assert.Equal(t, response, logs) }) t.Run("throw 500", func(t *testing.T) { @@ -84,6 +84,6 @@ func Test_ExecuteScript(t *testing.T) { script := "some groovy code" logs, err := jenkinsClient.executeScript(script, verifier) - assert.EqualError(t, err, "invalid status code '500'", logs) + assert.EqualError(t, err, "invalid status code '500', logs ''", logs) }) }