From 948e685802d347f331fefb659726036ea64cfdf3 Mon Sep 17 00:00:00 2001 From: Andrew Svoboda Date: Mon, 23 Aug 2021 16:43:00 +0100 Subject: [PATCH] Update go-githubapp to v0.9.1 (#328) --- go.mod | 2 +- go.sum | 4 ++-- .../palantir/go-githubapp/appconfig/appconfig.go | 12 ++++++++++++ vendor/modules.txt | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 1af5b9d4..26207fe2 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/google/go-querystring v1.0.0 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 github.com/palantir/go-baseapp v0.2.4 - github.com/palantir/go-githubapp v0.9.0 + github.com/palantir/go-githubapp v0.9.1 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.18.0 github.com/sergi/go-diff v1.1.0 // indirect diff --git a/go.sum b/go.sum index a74f3f2b..8f826bbf 100644 --- a/go.sum +++ b/go.sum @@ -228,8 +228,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/palantir/go-baseapp v0.2.4 h1:OtF5jipUF62ZRjLMLODZ2Rq180Kaekqm4pNOUZdOfAU= github.com/palantir/go-baseapp v0.2.4/go.mod h1:TSsvmXBDAAu2wZJgWi1/nG+YM5xIOEsXFmLsNoGP5O4= -github.com/palantir/go-githubapp v0.9.0 h1:5NmPwIUlEh/t0TOm+QoGMwZsjj2HTpgi2SaXLmFl8Do= -github.com/palantir/go-githubapp v0.9.0/go.mod h1:+reYl6s23olCHWigIXth27wvl0ckoInmZmY+Cyom0Ls= +github.com/palantir/go-githubapp v0.9.1 h1:XCAKfGshIrwuSmN0nPjj7c6+iHBEtoeRHQ/2/sdKGNA= +github.com/palantir/go-githubapp v0.9.1/go.mod h1:+reYl6s23olCHWigIXth27wvl0ckoInmZmY+Cyom0Ls= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/vendor/github.com/palantir/go-githubapp/appconfig/appconfig.go b/vendor/github.com/palantir/go-githubapp/appconfig/appconfig.go index 10134bbe..38e752db 100644 --- a/vendor/github.com/palantir/go-githubapp/appconfig/appconfig.go +++ b/vendor/github.com/palantir/go-githubapp/appconfig/appconfig.go @@ -242,6 +242,18 @@ func (ld *Loader) loadDefaultConfig(ctx context.Context, client *github.Client, continue } + // if remote refs are enabled, see if the file is a remote reference + if ld.parser != nil { + remote, err := ld.parser(p, content) + if err != nil { + return c, err + } + if remote != nil { + logger.Debug().Msgf("Found remote default configuration at %s in %s", p, c.Source) + return ld.loadRemoteConfig(ctx, client, *remote, c) + } + } + // non-remote content found, don't try any other paths logger.Debug().Msgf("Found default configuration at %s in %s", c.Path, c.Source) c.Content = content diff --git a/vendor/modules.txt b/vendor/modules.txt index cae278be..6f9c1553 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -36,7 +36,7 @@ github.com/inconshreveable/mousetrap github.com/palantir/go-baseapp/baseapp github.com/palantir/go-baseapp/baseapp/datadog github.com/palantir/go-baseapp/pkg/errfmt -# github.com/palantir/go-githubapp v0.9.0 +# github.com/palantir/go-githubapp v0.9.1 github.com/palantir/go-githubapp/appconfig github.com/palantir/go-githubapp/githubapp github.com/palantir/go-githubapp/oauth2