diff --git a/logserver.go b/logserver.go index 5f10d32..235fcdd 100644 --- a/logserver.go +++ b/logserver.go @@ -69,7 +69,6 @@ func (f *logServer) ServeHTTP(w http.ResponseWriter, r *http.Request) { serveFile(w, r, upath) } - func serveFile(w http.ResponseWriter, r *http.Request, path string) { d, err := os.Stat(path) if err != nil { @@ -144,9 +143,9 @@ func serveDirectory(w http.ResponseWriter, r *http.Request, path string) { } // Streams a dynamically created tar.gz file with the contents of the given directory -// Will serve a partial, corrupted response if there is a error partway through the +// Will serve a partial, corrupted response if there is a error partway through the // operation as we stream the response. -// +// // The resultant tarball will contain a single directory containing all the files // so it can unpack cleanly without overwriting other files. // @@ -163,14 +162,14 @@ func serveTarball(w http.ResponseWriter, r *http.Request, dir string) error { // and removes leading and trailing `/` and replaces internal `/` with `_` // to form a suitable filename for use in the content-disposition header // dfilename would turn into `2022-01-10_184843-BZZXEGYH` - dfilename := strings.Trim(r.URL.Path,"/") - dfilename = strings.Replace(dfilename, "/","_",-1) + dfilename := strings.Trim(r.URL.Path, "/") + dfilename = strings.Replace(dfilename, "/", "_", -1) - // There is no application/tgz or similar; return a gzip file as best option. - // This tends to trigger archive type tools, which will then use the filename to + // There is no application/tgz or similar; return a gzip file as best option. + // This tends to trigger archive type tools, which will then use the filename to // identify the contents correctly. w.Header().Set("Content-Type", "application/gzip") - w.Header().Set("Content-Disposition", "attachment; filename=" + dfilename + ".tar.gz") + w.Header().Set("Content-Disposition", "attachment; filename="+dfilename+".tar.gz") files, err := directory.Readdir(-1) if err != nil { @@ -182,7 +181,6 @@ func serveTarball(w http.ResponseWriter, r *http.Request, dir string) error { targz := tar.NewWriter(gzip) defer targz.Close() - for _, file := range files { if file.IsDir() { // We avoid including nested directories @@ -206,7 +204,7 @@ func serveTarball(w http.ResponseWriter, r *http.Request, dir string) error { return nil } -// Add a single file into the archive. +// Add a single file into the archive. func addToArchive(targz *tar.Writer, dfilename string, filename string) error { file, err := os.Open(filename) if err != nil { diff --git a/main.go b/main.go index 52ff5db..65a300d 100644 --- a/main.go +++ b/main.go @@ -180,7 +180,7 @@ func main() { log.Fatal(http.ListenAndServe(*bindAddr, nil)) } -func configureGenericWebhookClient(cfg *config) (*http.Client) { +func configureGenericWebhookClient(cfg *config) *http.Client { if len(cfg.GenericWebhookURLs) == 0 { fmt.Println("No generic_webhook_urls configured.") return nil diff --git a/submit.go b/submit.go index c6bb669..7ebda8c 100644 --- a/submit.go +++ b/submit.go @@ -58,7 +58,7 @@ type submitServer struct { slack *slackClient genericWebhookClient *http.Client - cfg *config + cfg *config } // the type of payload which can be uploaded as JSON to the submit endpoint @@ -77,11 +77,10 @@ type jsonLogEntry struct { Lines string `json:"lines"` } - type genericWebhookPayload struct { parsedPayload - ReportURL string `json:"report_url"` - ListingURL string `json:"listing_url"` + ReportURL string `json:"report_url"` + ListingURL string `json:"listing_url"` } // the payload after parsing @@ -509,7 +508,7 @@ func (s *submitServer) saveReport(ctx context.Context, p parsedPayload, reportDi // submitGenericWebhook submits a basic JSON body to an endpoint configured in the config // -// The request does not include the log body, only the metadata in the parsedPayload, +// The request does not include the log body, only the metadata in the parsedPayload, // with the required listingURL to obtain the logs over http if required. // // If a github or gitlab issue was previously made, the reportURL will also be passed. @@ -523,8 +522,8 @@ func (s *submitServer) submitGenericWebhook(p parsedPayload, listingURL string, } genericHookPayload := genericWebhookPayload{ parsedPayload: p, - ReportURL: reportURL, - ListingURL: listingURL, + ReportURL: reportURL, + ListingURL: listingURL, } for _, url := range s.cfg.GenericWebhookURLs { // Enrich the parsedPayload with a reportURL and listingURL, to convert a single struct @@ -554,7 +553,6 @@ func (s *submitServer) sendGenericWebhook(req *http.Request) { } } - func (s *submitServer) submitGithubIssue(ctx context.Context, p parsedPayload, listingURL string, resp *submitResponse) error { if s.ghClient == nil { return nil