resources/integrity: Return string instead of template.HTMLAttr

Closes #11513
This commit is contained in:
Joe Mooring 2023-09-29 09:22:58 -07:00 committed by Bjørn Erik Pedersen
parent 3af8bded26
commit 4c95389c25
2 changed files with 3 additions and 5 deletions

View file

@ -21,7 +21,6 @@ import (
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"hash" "hash"
"html/template"
"io" "io"
"github.com/gohugoio/hugo/resources/internal" "github.com/gohugoio/hugo/resources/internal"
@ -109,9 +108,9 @@ func (c *Client) Fingerprint(res resources.ResourceTransformer, algo string) (re
return res.Transform(&fingerprintTransformation{algo: algo}) return res.Transform(&fingerprintTransformation{algo: algo})
} }
func integrity(algo string, sum []byte) template.HTMLAttr { func integrity(algo string, sum []byte) string {
encoded := base64.StdEncoding.EncodeToString(sum) encoded := base64.StdEncoding.EncodeToString(sum)
return template.HTMLAttr(algo + "-" + encoded) return algo + "-" + encoded
} }
func digest(h hash.Hash) ([]byte, error) { func digest(h hash.Hash) ([]byte, error) {

View file

@ -15,7 +15,6 @@ package integrity
import ( import (
"context" "context"
"html/template"
"testing" "testing"
"github.com/gohugoio/hugo/resources/resource" "github.com/gohugoio/hugo/resources/resource"
@ -63,7 +62,7 @@ func TestTransform(t *testing.T) {
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
c.Assert(transformed.RelPermalink(), qt.Equals, "/hugo.a5ad1c6961214a55de53c1ce6e60d27b6b761f54851fa65e33066460dfa6a0db.txt") c.Assert(transformed.RelPermalink(), qt.Equals, "/hugo.a5ad1c6961214a55de53c1ce6e60d27b6b761f54851fa65e33066460dfa6a0db.txt")
c.Assert(transformed.Data(), qt.DeepEquals, map[string]any{"Integrity": template.HTMLAttr("sha256-pa0caWEhSlXeU8HObmDSe2t2H1SFH6ZeMwZkYN+moNs=")}) c.Assert(transformed.Data(), qt.DeepEquals, map[string]any{"Integrity": "sha256-pa0caWEhSlXeU8HObmDSe2t2H1SFH6ZeMwZkYN+moNs="})
content, err := transformed.(resource.ContentProvider).Content(context.Background()) content, err := transformed.(resource.ContentProvider).Content(context.Background())
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
c.Assert(content, qt.Equals, "Hugo Rocks!") c.Assert(content, qt.Equals, "Hugo Rocks!")