Fix resources.GetMatch, resources.Match, and resources.ByType to they don't normalize...

Fixes #12182

diff --git a/resources/resource_factories/create/create.go b/resources/resource_factories/create/create.go
index 0cf84c49b9c49869ce268ac92d85409dc939fd81..ac1a2af0777a93758a336bacb477a3f63c8f5364 100644 (file)
--- a/resources/resource_factories/create/create.go
+++ b/resources/resource_factories/create/create.go
@@ -134,7 +134,7 @@ func (c *Client) match(name, pattern string, matchFunc func(r resource.Resource)
                                        return meta.Open()
                                },
                                GroupIdentity: meta.PathInfo,
-                               TargetPath:    meta.PathInfo.PathNoLang(),
+                               TargetPath:    meta.PathInfo.Unnormalized().Path(),
                        })
                        if err != nil {
                                return true, err

diff --git a/tpl/resources/resources_integration_test.go b/tpl/resources/resources_integration_test.go
index 5a3c296665a4e30541ff65b1287f5938a5e71b38..d72b1350729dece883e231c415d2462ecc5b5606 100644 (file)
--- a/tpl/resources/resources_integration_test.go
+++ b/tpl/resources/resources_integration_test.go
@@ -116,3 +116,30 @@ Empty string not found
 
                `)
 }
+
+func TestResourcesGettersShouldNotNormalizePermalinks(t *testing.T) {
+       t.Parallel()
+
+       files := `
+-- config.toml --
+baseURL = "http://example.com/"
+-- assets/401K Prospectus.txt --
+Prospectus.
+-- layouts/index.html --
+{{ $name := "401K Prospectus.txt" }}
+Get: {{ with resources.Get $name }}{{ .RelPermalink }}|{{ .Permalink }}|{{ end }}
+GetMatch: {{ with resources.GetMatch $name }}{{ .RelPermalink }}|{{ .Permalink }}|{{ end }}
+Match: {{ with (index (resources.Match $name) 0) }}{{ .RelPermalink }}|{{ .Permalink }}|{{ end }}
+ByType: {{ with (index (resources.ByType "text") 0) }}{{ .RelPermalink }}|{{ .Permalink }}|{{ end }}
+       `
+
+       b := hugolib.Test(t, files)
+
+       b.AssertFileContent("public/index.html", `
+Get: /401K%20Prospectus.txt|http://example.com/401K%20Prospectus.txt|
+GetMatch: /401K%20Prospectus.txt|http://example.com/401K%20Prospectus.txt|
+Match: /401K%20Prospectus.txt|http://example.com/401K%20Prospectus.txt|
+ByType: /401K%20Prospectus.txt|http://example.com/401K%20Prospectus.txt|
+
+               `)
+}