From 02df1f2879c8413f51efead0bf54b72c3f97dd92 Mon Sep 17 00:00:00 2001
From: Mzack9999 <mzack9999@protonmail.com>
Date: Tue, 7 Feb 2023 10:16:37 +0100
Subject: [PATCH] removing go 1.20 helpers

---
 v2/go.mod                     |  2 +-
 v2/pkg/reporting/reporting.go | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/v2/go.mod b/v2/go.mod
index 51edf74ac..b138fdbbe 100644
--- a/v2/go.mod
+++ b/v2/go.mod
@@ -43,7 +43,7 @@ require (
 	github.com/valyala/fasttemplate v1.2.2
 	github.com/weppos/publicsuffix-go v0.15.1-0.20220724114530-e087fba66a37
 	github.com/xanzy/go-gitlab v0.79.0
-	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/multierr v1.9.0
 	golang.org/x/net v0.5.0
 	golang.org/x/oauth2 v0.4.0
 	golang.org/x/text v0.6.0
diff --git a/v2/pkg/reporting/reporting.go b/v2/pkg/reporting/reporting.go
index 3ca188321..f98b84d35 100644
--- a/v2/pkg/reporting/reporting.go
+++ b/v2/pkg/reporting/reporting.go
@@ -4,6 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"go.uber.org/multierr"
 	"gopkg.in/yaml.v2"
 
 	"errors"
@@ -98,7 +99,7 @@ func New(options *Options, db string) (Client, error) {
 		options.GitHub.HttpClient = options.HttpClient
 		tracker, err := github.New(options.GitHub)
 		if err != nil {
-			return nil, errors.Join(err, ErrReportingClientCreation)
+			return nil, errorutil.NewWithErr(err).Wrap(ErrReportingClientCreation)
 		}
 		client.trackers = append(client.trackers, tracker)
 	}
@@ -106,7 +107,7 @@ func New(options *Options, db string) (Client, error) {
 		options.GitLab.HttpClient = options.HttpClient
 		tracker, err := gitlab.New(options.GitLab)
 		if err != nil {
-			return nil, errors.Join(err, ErrReportingClientCreation)
+			return nil, errorutil.NewWithErr(err).Wrap(ErrReportingClientCreation)
 		}
 		client.trackers = append(client.trackers, tracker)
 	}
@@ -114,21 +115,21 @@ func New(options *Options, db string) (Client, error) {
 		options.Jira.HttpClient = options.HttpClient
 		tracker, err := jira.New(options.Jira)
 		if err != nil {
-			return nil, errors.Join(err, ErrReportingClientCreation)
+			return nil, errorutil.NewWithErr(err).Wrap(ErrReportingClientCreation)
 		}
 		client.trackers = append(client.trackers, tracker)
 	}
 	if options.MarkdownExporter != nil {
 		exporter, err := markdown.New(options.MarkdownExporter)
 		if err != nil {
-			return nil, errors.Join(err, ErrExportClientCreation)
+			return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
 		}
 		client.exporters = append(client.exporters, exporter)
 	}
 	if options.SarifExporter != nil {
 		exporter, err := sarif.New(options.SarifExporter)
 		if err != nil {
-			return nil, errors.Join(err, ErrExportClientCreation)
+			return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
 		}
 		client.exporters = append(client.exporters, exporter)
 	}
@@ -136,7 +137,7 @@ func New(options *Options, db string) (Client, error) {
 		options.ElasticsearchExporter.HttpClient = options.HttpClient
 		exporter, err := es.New(options.ElasticsearchExporter)
 		if err != nil {
-			return nil, errors.Join(err, ErrExportClientCreation)
+			return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
 		}
 		client.exporters = append(client.exporters, exporter)
 	}
@@ -144,7 +145,7 @@ func New(options *Options, db string) (Client, error) {
 		options.SplunkExporter.HttpClient = options.HttpClient
 		exporter, err := splunk.New(options.SplunkExporter)
 		if err != nil {
-			return nil, errors.Join(err, ErrExportClientCreation)
+			return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
 		}
 		client.exporters = append(client.exporters, exporter)
 	}
@@ -222,12 +223,12 @@ func (c *ReportingClient) CreateIssue(event *output.ResultEvent) error {
 	if unique {
 		for _, tracker := range c.trackers {
 			if trackerErr := tracker.CreateIssue(event); trackerErr != nil {
-				err = errors.Join(err, trackerErr)
+				err = multierr.Append(err, trackerErr)
 			}
 		}
 		for _, exporter := range c.exporters {
 			if exportErr := exporter.Export(event); exportErr != nil {
-				err = errors.Join(err, exportErr)
+				err = multierr.Append(err, exportErr)
 			}
 		}
 	}