diff --git a/.gitignore b/.gitignore index 193257f..456761a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +run/ ### Go ### # Binaries for programs and plugins diff --git a/build/Run_crawler b/build/Run_crawler new file mode 100644 index 0000000..8493dd6 Binary files /dev/null and b/build/Run_crawler differ diff --git a/crawl/internal/config/config.go b/crawl/internal/config/config.go new file mode 100644 index 0000000..4768417 --- /dev/null +++ b/crawl/internal/config/config.go @@ -0,0 +1,47 @@ +package config + +import ( + "git.tdpain.net/pkg/cfger" + "log/slog" + "os" + "sync" +) + +type Config struct { + DatabaseName string + NumWorkers int + MaxPagesPerDomain int + UserAgent string + CrawlDataDir string +} + +var ( + conf *Config + loadOnce = new(sync.Once) +) + +func Get() *Config { + var outerErr error + loadOnce.Do(func() { + cl := cfger.New() + if err := cl.Load("config.yml"); err != nil { + outerErr = err + return + } + + conf = &Config{ + DatabaseName: cl.WithDefault("crawler.databaseName", "crawler.db").AsString(), + NumWorkers: cl.WithDefault("crawler.numWorkers", 8).AsInt(), + MaxPagesPerDomain: cl.WithDefault("crawler.maxPagesPerDomain", 300).AsInt(), + UserAgent: cl.WithDefault("crawler.userAgent", "Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0").AsString(), + CrawlDataDir: cl.WithDefault("crawler.dataDir", "crawlData").AsString(), + } + }) + + if outerErr != nil { + slog.Error("fatal error when loading configuration", "err", outerErr) + os.Exit(1) + } + + return conf +} diff --git a/crawl/internal/crawlcore/crawl.go b/crawl/internal/crawlcore/crawl.go new file mode 100644 index 0000000..188de59 --- /dev/null +++ b/crawl/internal/crawlcore/crawl.go @@ -0,0 +1,273 @@ +package crawlcore + +import ( + "bytes" + "context" + "database/sql" + "encoding/json" + "errors" + "fmt" + "git.tdpain.net/codemicro/hn84/crawl/internal/config" + "git.tdpain.net/codemicro/hn84/crawl/internal/database" + "git.tdpain.net/codemicro/hn84/util" + "github.com/PuerkitoBio/goquery" + "github.com/carlmjohnson/requests" + "log/slog" + "net/url" + "os" + "path" + "slices" + "strings" + "time" +) + +func (c *CrawlCore) Loop(stop chan struct{}) error { + jobs := make(chan *database.Site) + + defer func() { + slog.Info("waiting for all workers to terminate") + c.workerWG.Wait() + }() + defer close(jobs) + + numWorkers := config.Get().NumWorkers + + _ = os.MkdirAll(config.Get().CrawlDataDir, os.ModeDir) + + slog.Info("starting workers", "n", numWorkers) + + for i := 0; i < numWorkers; i += 1 { + go c.worker(i, jobs) + } + + slog.Info("crawl loop alive") + +mainLoop: + for { + if stop != nil { + select { + case <-stop: + break mainLoop + default: + } + } + + tx, err := c.DB.BeginTx(context.Background(), nil) + if err != nil { + return util.Wrap("create crawl loop transaction", err) + } + + site := new(database.Site) + if err := tx.NewSelect().Model(site).Order("id asc").Limit(1).Scan(context.Background(), site); err != nil { + if errors.Is(err, sql.ErrNoRows) { + tx.Rollback() + time.Sleep(time.Second) + continue + } + tx.Rollback() + return util.Wrap("select next site to crawl", err) + } + + if _, err := tx.NewDelete().Model(site).Where("id = ?", site.ID).Exec(context.Background()); err != nil { + tx.Rollback() + return util.Wrap("delete crawled site", err) + } + + if err := markDomainSeen(tx, site.Domain); err != nil { + tx.Rollback() + return util.Wrap("mark domain as seen", err) + } + + if err := tx.Commit(); err != nil { + tx.Rollback() + return util.Wrap("commit crawl loop transaction", err) + } + + jobs <- site + } + + return nil +} + +type pageMeta struct { + Time time.Time + URL string +} + +func (c *CrawlCore) worker(workerID int, jobChan chan *database.Site) { + c.workerWG.Add(1) + + log := slog.With("worker", workerID) + + for site := range jobChan { + conf := config.Get() + log.Info("run", "domain", site.Domain) + currPageNumber := 0 + + if site.StartURL == "" { + site.StartURL = "http://" + site.Domain + "/" + } + + queuedURLs := map[string]struct{}{ + site.StartURL: {}, + } + urlQueue := []string{site.StartURL} + + otherDomains := make(map[string]string) + + pageLoop: + for { + if currPageNumber == conf.MaxPagesPerDomain { + log.Info("hit page number limit", "domain", site.Domain) + break + } + var currentURL string + if len(urlQueue) == 0 { + break + } else { + currentURL = urlQueue[0] + urlQueue = slices.Delete(urlQueue, 0, 1) + } + + // Get page + var pageBody string + + ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) + err := requests.URL(currentURL).ToString(&pageBody).UserAgent(conf.UserAgent).Fetch(ctx) + cancel() + + if err != nil { + log.Warn("failed to fetch page", "url", currentURL, "error", err) + break pageLoop + } + + // Extract links + doc, err := goquery.NewDocumentFromReader(bytes.NewReader([]byte(pageBody))) + if err != nil { + // TODO: Check that we get HTML back + log.Error("failed to parse page", "error", err, "url", currentURL) + continue pageLoop + } + + currentParsedURL, err := url.Parse(currentURL) + if err != nil { + log.Error("unable to parse current page URL", "error", err, "url", currentURL) + continue pageLoop + } + + doc.Find("a").Each(func(i int, selection *goquery.Selection) { + href, exists := selection.Attr("href") + if !exists || href == "" { + return + } + + thisURL, err := url.Parse(href) + if err != nil { + return + } + + if thisURL.Scheme == "" { + thisURL.Scheme = currentParsedURL.Scheme + } else if !(thisURL.Scheme == "http" || thisURL.Scheme == "https") { + return + } + + if thisURL.Host == "" { + if thisURL.Path == "" { + // This is either a URL with a fragment or query string + return + } + thisURL.Host = currentParsedURL.Host + + if !strings.HasPrefix(thisURL.Path, "/") { + if strings.HasSuffix(currentParsedURL.Path, "/") { + thisURL.Path = currentParsedURL.Path + thisURL.Path + } else { + thisURL.Path = path.Base(currentParsedURL.Path) + "/" + thisURL.Path + } + } + } else { + // TODO: this is potentially fumbling some pages that aren't linked directly within the other website + + tx, err := c.DB.Begin() + if err != nil { + log.Error("faild to open transaction", "error", err) + return + } + defer tx.Rollback() + + host := strings.ToLower(thisURL.Host) + if _, found := otherDomains[host]; found { + return + } + + if beenSeen, err := hasDomainBeenSeen(tx, host); err != nil { + log.Error("failed to lookup domain status", "error", err) + return + } else if beenSeen { + return + } + + otherDomains[host] = href + + if err := markDomainSeen(tx, host); err != nil { + log.Error("failed to mark domain as seen", "error", err) + return + } + + if _, err := tx.NewInsert().Model(&database.Site{ + ID: snow.Generate(), + Domain: host, + }).Exec(context.Background()); err != nil { + log.Error("insert new Site record", "error", err) + return + } + + if err := tx.Commit(); err != nil { + log.Error("failed to commit cross-domain link checking transaction", "error", err) + return + } + + return + } + + thisURL.RawQuery = "" + thisURL.Fragment = "" + + u := thisURL.String() + if _, found := queuedURLs[u]; !found { + urlQueue = append(urlQueue, u) + queuedURLs[u] = struct{}{} + } + }) + + // Dump to disk + metaData := &pageMeta{ + Time: time.Now(), + URL: currentURL, + } + metaJSON, err := json.Marshal(metaData) + if err != nil { + log.Error("failed to marshal site metadata", "error", err) + break + } + + baseFname := path.Join(conf.CrawlDataDir, fmt.Sprintf("%d.%d", site.ID, currPageNumber)) + + if err := os.WriteFile(baseFname+".html", []byte(pageBody), 0644); err != nil { + log.Error("failed to dump page content", "error", err, "fname", baseFname) + } + + if err := os.WriteFile(baseFname+".json", metaJSON, 0644); err != nil { + log.Error("failed to dump page metadata", "error", err, "fname", baseFname) + } + + // Go places + currPageNumber += 1 + } + } + + log.Info("worker stopping") + + c.workerWG.Done() +} diff --git a/crawl/internal/crawlcore/crawlcore.go b/crawl/internal/crawlcore/crawlcore.go new file mode 100644 index 0000000..b50e1d7 --- /dev/null +++ b/crawl/internal/crawlcore/crawlcore.go @@ -0,0 +1,62 @@ +package crawlcore + +import ( + "context" + "git.tdpain.net/codemicro/hn84/crawl/internal/database" + "git.tdpain.net/codemicro/hn84/util" + "github.com/bwmarrin/snowflake" + "github.com/uptrace/bun" + "net/url" + "strings" + "sync" +) + +var snow, _ = snowflake.NewNode(1) + +type CrawlCore struct { + DB *bun.DB + workerWG sync.WaitGroup +} + +func New(db *bun.DB) *CrawlCore { + return &CrawlCore{ + DB: db, + } +} + +func (c *CrawlCore) AddSite(startURL string) error { + parsedURL, err := url.Parse(startURL) + if err != nil { + return util.Wrap("parse start URL", err) + } + + site := &database.Site{ + ID: snow.Generate(), + Domain: parsedURL.Host, + StartURL: startURL, + } + + if _, err := c.DB.NewInsert().Model(site).Exec(context.Background()); err != nil { + return util.Wrap("insert new Site record", err) + } + return nil +} + +func hasDomainBeenSeen(db bun.IDB, domain string) (bool, error) { + domain = strings.ToLower(domain) + n, err := db.NewSelect().Model((*database.SeenDomain)(nil)).Where("domain = ?", domain).Count(context.Background()) + if err != nil { + return false, util.Wrap("select seen domains", err) + } + return n >= 1, nil +} + +func markDomainSeen(db bun.IDB, domain string) error { + domain = strings.ToLower(domain) + if _, err := db.NewInsert().Model(&database.SeenDomain{ + Domain: domain, + }).Ignore().Exec(context.Background()); err != nil { + return util.Wrap("mark domain as seen", err) + } + return nil +} diff --git a/crawl/internal/database/db.go b/crawl/internal/database/db.go new file mode 100644 index 0000000..67ee715 --- /dev/null +++ b/crawl/internal/database/db.go @@ -0,0 +1,59 @@ +package database + +import ( + "context" + "database/sql" + "errors" + "git.tdpain.net/codemicro/hn84/util" + "github.com/bwmarrin/snowflake" + _ "github.com/mattn/go-sqlite3" + "github.com/uptrace/bun" + "github.com/uptrace/bun/dialect/sqlitedialect" + "os" +) + +type Site struct { + bun.BaseModel + + ID snowflake.ID `bun:",pk"` + Domain string `bun:",notnull,unique"` + StartURL string +} + +type SeenDomain struct { + bun.BaseModel + + Domain string `bun:",pk"` +} + +func Setup(filepath string) (*bun.DB, error) { + alreadyExists := true + if _, err := os.Stat(filepath); err != nil { + if !errors.Is(err, os.ErrNotExist) { + return nil, err + } + alreadyExists = false + } + + db, err := sql.Open("sqlite3", filepath) + if err != nil { + return nil, util.Wrap("open database", err) + } + + db.SetMaxOpenConns(1) // https://github.com/mattn/go-sqlite3/issues/274#issuecomment-191597862 + + b := bun.NewDB(db, sqlitedialect.New()) + //b.AddQueryHook(bundebug.NewQueryHook(bundebug.WithVerbose(true))) + + if !alreadyExists { + if _, err := b.NewCreateTable().Model((*Site)(nil)).Exec(context.Background()); err != nil { + return nil, util.Wrap("create Site table", err) + } + + if _, err := b.NewCreateTable().Model((*SeenDomain)(nil)).Exec(context.Background()); err != nil { + return nil, util.Wrap("create SeenDomain table", err) + } + } + + return b, nil +} diff --git a/crawl/main.go b/crawl/main.go new file mode 100644 index 0000000..f4c2864 --- /dev/null +++ b/crawl/main.go @@ -0,0 +1,52 @@ +package main + +import ( + "errors" + "git.tdpain.net/codemicro/hn84/crawl/internal/config" + "git.tdpain.net/codemicro/hn84/crawl/internal/crawlcore" + "git.tdpain.net/codemicro/hn84/crawl/internal/database" + "git.tdpain.net/codemicro/hn84/util" + "log/slog" + "os" +) + +func main() { + if err := run(); err != nil { + slog.Error("unrecoverable runtime error", "error", err) + os.Exit(1) + } +} + +func run() error { + db, err := database.Setup(config.Get().DatabaseName) + if err != nil { + return util.Wrap("setup database", err) + } + + cc := crawlcore.New(db) + + if len(os.Args) < 2 { + return errors.New("too few arguments") + } + + op := os.Args[1] + + switch op { + case "add": + if len(os.Args) < 3 { + return errors.New("missing start URL") + } + + if err := cc.AddSite(os.Args[2]); err != nil { + return util.Wrap("add site", err) + } + case "run": + if err := cc.Loop(nil); err != nil { + return util.Wrap("run crawl loop", err) + } + default: + return errors.New("unrecognised operation") + } + + return nil +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..8d39d99 --- /dev/null +++ b/go.mod @@ -0,0 +1,25 @@ +module git.tdpain.net/codemicro/hn84 + +go 1.21.1 + +require ( + git.tdpain.net/pkg/cfger v0.1.0 // indirect + github.com/PuerkitoBio/goquery v1.8.1 // indirect + github.com/andybalholm/cascadia v1.3.1 // indirect + github.com/bwmarrin/snowflake v0.3.0 // indirect + github.com/carlmjohnson/requests v0.23.5 // indirect + github.com/fatih/color v1.15.0 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-sqlite3 v1.14.17 // indirect + github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect + github.com/uptrace/bun v1.1.16 // indirect + github.com/uptrace/bun/dialect/sqlitedialect v1.1.16 // indirect + github.com/uptrace/bun/extra/bundebug v1.1.16 // indirect + github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + golang.org/x/net v0.15.0 // indirect + golang.org/x/sys v0.12.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..b7910a1 --- /dev/null +++ b/go.sum @@ -0,0 +1,77 @@ +git.tdpain.net/pkg/cfger v0.1.0 h1:Yhs2DaFIdbcSrbyywhsoxrHPevDEEBEKbqJqrUa3eso= +git.tdpain.net/pkg/cfger v0.1.0/go.mod h1:Kq5/hsUnYSYM2BVGFtXMlYEDIsIYiZTz4MUIlqZeX0k= +github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= +github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= +github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= +github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= +github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= +github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= +github.com/carlmjohnson/requests v0.23.5 h1:NPANcAofwwSuC6SIMwlgmHry2V3pLrSqRiSBKYbNHHA= +github.com/carlmjohnson/requests v0.23.5/go.mod h1:zG9P28thdRnN61aD7iECFhH5iGGKX2jIjKQD9kqYH+o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= +github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo= +github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs= +github.com/uptrace/bun v1.1.16 h1:cn9cgEMFwcyYRsQLfxCRMUxyK1WaHwOVrR3TvzEFZ/A= +github.com/uptrace/bun v1.1.16/go.mod h1:7HnsMRRvpLFUcquJxp22JO8PsWKpFQO/gNXqqsuGWg8= +github.com/uptrace/bun/dialect/sqlitedialect v1.1.16 h1:gbc9BP/e4sNOB9VBj+Si46dpOz2oktmZPidkda92GYY= +github.com/uptrace/bun/dialect/sqlitedialect v1.1.16/go.mod h1:YNezpK7fIn5Wa2WGmTCZ/nEyiswcXmuT4iNWADeL1x4= +github.com/uptrace/bun/extra/bundebug v1.1.16 h1:SgicRQGtnjhrIhlYOxdkOm1Em4s6HykmT3JblHnoTBM= +github.com/uptrace/bun/extra/bundebug v1.1.16/go.mod h1:SkiOkfUirBiO1Htc4s5bQKEq+JSeU1TkBVpMsPz2ePM= +github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= +github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= +github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/util/util.go b/util/util.go new file mode 100644 index 0000000..2598b16 --- /dev/null +++ b/util/util.go @@ -0,0 +1,9 @@ +package util + +import ( + "fmt" +) + +func Wrap(label string, err error) error { + return fmt.Errorf("%s: %w", label, err) +}