github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

deps: Upgrade github.com/bep/gitmap v1.4.0 => v1.6.0 (note)

Browse source 
Closes #8627
This commit is contained in:
Bjørn Erik Pedersen 2024-07-17 09:15:44 +02:00
parent 439f07eac4
commit 7be0377505
6 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/security/securityConfig.go
View file

@ -37,6 +37,7 @@ var DefaultConfig = Config{
Allow: MustNewWhitelist( Allow: MustNewWhitelist(
"^(dart-)?sass(-embedded)?$", // sass, dart-sass, dart-sass-embedded. "^(dart-)?sass(-embedded)?$", // sass, dart-sass, dart-sass-embedded.
"^go$", // for Go Modules "^go$", // for Go Modules
"^git$", // For Git info
"^npx$", // used by all Node tools (Babel, PostCSS). "^npx$", // used by all Node tools (Babel, PostCSS).
"^postcss$", "^postcss$",
"^tailwindcss$", "^tailwindcss$",

2
config/security/securityConfig_test.go
View file

@ -135,7 +135,7 @@ func TestToTOML(t *testing.T) {
got := DefaultConfig.ToTOML() got := DefaultConfig.ToTOML()
c.Assert(got, qt.Equals, c.Assert(got, qt.Equals,
"[security]\n enableInlineShortcodes = false\n\n [security.exec]\n allow = ['^(dart-)?sass(-embedded)?$', '^go$', '^npx$', '^postcss$', '^tailwindcss$']\n osEnv = ['(?i)^((HTTPS?|NO)_PROXY|PATH(EXT)?|APPDATA|TE?MP|TERM|GO\\w+|(XDG_CONFIG_)?HOME|USERPROFILE|SSH_AUTH_SOCK|DISPLAY|LANG|SYSTEMDRIVE)$']\n\n [security.funcs]\n getenv = ['^HUGO_', '^CI$']\n\n [security.http]\n methods = ['(?i)GET|POST']\n urls = ['.*']", "[security]\n enableInlineShortcodes = false\n\n [security.exec]\n allow = ['^(dart-)?sass(-embedded)?$', '^go$', '^git$', '^npx$', '^postcss$', '^tailwindcss$']\n osEnv = ['(?i)^((HTTPS?|NO)_PROXY|PATH(EXT)?|APPDATA|TE?MP|TERM|GO\\w+|(XDG_CONFIG_)?HOME|USERPROFILE|SSH_AUTH_SOCK|DISPLAY|LANG|SYSTEMDRIVE)$']\n\n [security.funcs]\n getenv = ['^HUGO_', '^CI$']\n\n [security.http]\n methods = ['(?i)GET|POST']\n urls = ['.*']",
) )
} }

2
go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4
github.com/bep/clocks v0.5.0 github.com/bep/clocks v0.5.0
github.com/bep/debounce v1.2.0 github.com/bep/debounce v1.2.0
github.com/bep/gitmap v1.4.0 github.com/bep/gitmap v1.6.0
github.com/bep/goat v0.5.0 github.com/bep/goat v0.5.0
github.com/bep/godartsass v1.2.0 github.com/bep/godartsass v1.2.0
github.com/bep/godartsass/v2 v2.0.0 github.com/bep/godartsass/v2 v2.0.0

4
go.sum
View file

@ -120,6 +120,10 @@ github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
github.com/bep/gitmap v1.4.0 h1:GeWbPb2QDTfcZLBQmCB693N3sJmPQfeu81fDrD5r8x8= github.com/bep/gitmap v1.4.0 h1:GeWbPb2QDTfcZLBQmCB693N3sJmPQfeu81fDrD5r8x8=
github.com/bep/gitmap v1.4.0/go.mod h1:n+3W1f/rot2hynsqEGxGMErPRgT41n9CkGuzPvz9cIw= github.com/bep/gitmap v1.4.0/go.mod h1:n+3W1f/rot2hynsqEGxGMErPRgT41n9CkGuzPvz9cIw=
github.com/bep/gitmap v1.5.0 h1:ExDl7HeDaRDG8FXFRTnv20qzbyJlC6ivdOboMYFvrms=
github.com/bep/gitmap v1.5.0/go.mod h1:n+3W1f/rot2hynsqEGxGMErPRgT41n9CkGuzPvz9cIw=
github.com/bep/gitmap v1.6.0 h1:sDuQMm9HoTL0LtlrfxjbjgAg2wHQd4nkMup2FInYzhA=
github.com/bep/gitmap v1.6.0/go.mod h1:n+3W1f/rot2hynsqEGxGMErPRgT41n9CkGuzPvz9cIw=
github.com/bep/goat v0.5.0 h1:S8jLXHCVy/EHIoCY+btKkmcxcXFd34a0Q63/0D4TKeA= github.com/bep/goat v0.5.0 h1:S8jLXHCVy/EHIoCY+btKkmcxcXFd34a0Q63/0D4TKeA=
github.com/bep/goat v0.5.0/go.mod h1:Md9x7gRxiWKs85yHlVTvHQw9rg86Bm+Y4SuYE8CTH7c= github.com/bep/goat v0.5.0/go.mod h1:Md9x7gRxiWKs85yHlVTvHQw9rg86Bm+Y4SuYE8CTH7c=
github.com/bep/godartsass v1.2.0 h1:E2VvQrxAHAFwbjyOIExAMmogTItSKodoKuijNrGm5yU= github.com/bep/godartsass v1.2.0 h1:E2VvQrxAHAFwbjyOIExAMmogTItSKodoKuijNrGm5yU=

24
hugolib/gitinfo.go
View file

@ -14,11 +14,13 @@
package hugolib package hugolib
import ( import (
"io"
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/bep/gitmap" "github.com/bep/gitmap"
"github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/common/hexec"
"github.com/gohugoio/hugo/deps"
"github.com/gohugoio/hugo/resources/page" "github.com/gohugoio/hugo/resources/page"
"github.com/gohugoio/hugo/source" "github.com/gohugoio/hugo/source"
) )
@ -38,10 +40,24 @@ func (g *gitInfo) forPage(p page.Page) source.GitInfo {
return source.NewGitInfo(*gi) return source.NewGitInfo(*gi)
} }
func newGitInfo(conf config.AllProvider) (*gitInfo, error) { func newGitInfo(d *deps.Deps) (*gitInfo, error) {
workingDir := conf.BaseConfig().WorkingDir opts := gitmap.Options{
Repository: d.Conf.BaseConfig().WorkingDir,
GetGitCommandFunc: func(stdout, stderr io.Writer, args ...string) (gitmap.Runner, error) {
var argsv []any
for _, arg := range args {
argsv = append(argsv, arg)
}
argsv = append(
argsv,
hexec.WithStdout(stdout),
hexec.WithStderr(stderr),
)
return d.ExecHelper.New("git", argsv...)
},
}
gitRepo, err := gitmap.Map(workingDir, "") gitRepo, err := gitmap.Map(opts)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
hugolib/hugo_sites.go
View file

@ -346,7 +346,7 @@ func (h *HugoSites) GetContentPage(filename string) page.Page {
func (h *HugoSites) loadGitInfo() error { func (h *HugoSites) loadGitInfo() error {
if h.Configs.Base.EnableGitInfo { if h.Configs.Base.EnableGitInfo {
gi, err := newGitInfo(h.Conf) gi, err := newGitInfo(h.Deps)
if err != nil { if err != nil {
h.Log.Errorln("Failed to read Git log:", err) h.Log.Errorln("Failed to read Git log:", err)
} else { } else {