all repos — homestead @ 5b66286b3f86e4268e3af68ced4c63d410552b17

Code for my website

fetcher: remove single-file fetch support

Alan Pearce
commit

5b66286b3f86e4268e3af68ced4c63d410552b17

parent

acb17eefc62414e4c1cd6061e0293873a1a9c13c

1 file changed, 0 insertions(+), 47 deletions(-)

changed files
M domain/content/fetcher/fetcher.godomain/content/fetcher/fetcher.go
@@ -4,7 +4,6 @@ import (
"context" "errors" "fmt" - "io" "io/fs" "math" "net/http"
@@ -39,7 +38,6 @@ Listener events.Listener
} var ( - files = []string{"config.toml"} archive = "site.tar.bz2" numericFilename = regexp.MustCompile("[0-9]+") timeout = 10 * time.Second
@@ -151,13 +149,6 @@ if err != nil {
return fault.Wrap(err, fmsg.With("could not create directory")) } - for _, file := range files { - err := f.getFile(runID, file) - if err != nil { - return fault.Wrap(err, fmsg.With("could not fetch file")) - } - } - err = f.getArchive(runID, archive) if err != nil { return fault.Wrap(err, fmsg.With("could not fetch archive"))
@@ -208,44 +199,6 @@ runID = "latest"
} return f.options.FetchURL.JoinPath(runID, basename).String() -} - -func (f *Fetcher) getFile(runID, basename string) error { - filename := filepath.Join(runID, basename) - url := f.makeURL(runID, basename) - - f.log.Debug("getting file", "filename", filename, "url", url) - - file, err := f.root.OpenFile(filename, os.O_CREATE|os.O_WRONLY, 0o600) - if err != nil { - return fault.Wrap(err, fmsg.With("could not open file")) - } - defer file.Close() - - ctx, cancel := context.WithTimeout(context.Background(), timeout) - defer cancel() - - req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) - if err != nil { - return fault.Wrap(err, fmsg.With("could not create request")) - } - res, err := http.DefaultClient.Do(req) - if err != nil { - return fault.Wrap(err, fmsg.With("could not issue request")) - } - defer res.Body.Close() - - _, err = io.Copy(file, res.Body) - if err != nil { - return fault.Wrap(err, fmsg.With("could not write file")) - } - - err = file.Sync() - if err != nil { - return fault.Wrap(err, fmsg.With("could not sync file")) - } - - return nil } func (f *Fetcher) getArchive(runID, basename string) error {