Use self hosted raymond templating library

SpectoLabs · Mar 12, 2024 · 9e0fc31 · 9e0fc31
1 parent 98d183a
commit 9e0fc31
Show file tree

Hide file tree

Showing 25 changed files with 34 additions and 7 deletions.
diff --git a/core/hoverfly_funcs.go b/core/hoverfly_funcs.go
@@ -14,7 +14,7 @@ import (
 	"github.com/SpectoLabs/hoverfly/core/models"
 	"github.com/SpectoLabs/hoverfly/core/modes"
 	"github.com/SpectoLabs/hoverfly/core/util"
-	"github.com/aymerick/raymond"
+	"github.com/SpectoLabs/raymond"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/core/journal/journal_index.go b/core/journal/journal_index.go
@@ -4,7 +4,7 @@ import (
 	v2 "github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/core/models"
 	"github.com/SpectoLabs/hoverfly/core/util"
-	"github.com/aymerick/raymond"
+	"github.com/SpectoLabs/raymond"
 	"strings"
 )
 

diff --git a/core/models/cached_response.go b/core/models/cached_response.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/aymerick/raymond"
+	"github.com/SpectoLabs/raymond"
 )
 
 type CachedResponse struct {

diff --git a/core/templating/template_helpers.go b/core/templating/template_helpers.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/aymerick/raymond"
+	"github.com/SpectoLabs/raymond"
 	"github.com/pborman/uuid"
 
 	"github.com/SpectoLabs/hoverfly/core/util"

diff --git a/core/templating/templating.go b/core/templating/templating.go
@@ -11,7 +11,7 @@ import (
 	"github.com/brianvoe/gofakeit/v6"
 
 	"github.com/SpectoLabs/hoverfly/core/models"
-	"github.com/aymerick/raymond"
+	"github.com/SpectoLabs/raymond"
 
 	log "github.com/sirupsen/logrus"
 )

diff --git a/go.mod b/go.mod
@@ -6,8 +6,8 @@ require (
 	github.com/ChrisTrenkamp/xsel v0.9.6
 	github.com/SpectoLabs/goproxy v0.0.0-20220724221645-71c396c297b7
 	github.com/SpectoLabs/goproxy/ext v0.0.0-20220724221645-71c396c297b7
+	github.com/SpectoLabs/raymond v2.0.2+incompatible
 	github.com/antonholmquist/jason v1.0.1-0.20160829104012-962e09b85496
-	github.com/aymerick/raymond v2.0.2+incompatible
 	github.com/beevik/etree v1.1.0
 	github.com/boltdb/bolt v1.2.1-0.20160424201119-d97499360d1e
 	github.com/brianvoe/gofakeit/v6 v6.19.0
@@ -45,6 +45,7 @@ require (
 
 require (
 	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/aymerick/raymond v2.0.2+incompatible // indirect
 	github.com/corpix/uarand v0.0.0-20170903190822-2b8494104d86 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect

diff --git a/go.sum b/go.sum
@@ -7,6 +7,8 @@ github.com/SpectoLabs/goproxy v0.0.0-20220724221645-71c396c297b7 h1:TTZvVLRa0sjo
 github.com/SpectoLabs/goproxy v0.0.0-20220724221645-71c396c297b7/go.mod h1:tj8G0iNIS9fkG5PSrzQYLUXcvhtqI8XbIld9PqpYaFw=
 github.com/SpectoLabs/goproxy/ext v0.0.0-20220724221645-71c396c297b7 h1:MxMvFwL66nKnrmjHhp9GODbHVZ+/qS2MmvnXz/nDdR4=
 github.com/SpectoLabs/goproxy/ext v0.0.0-20220724221645-71c396c297b7/go.mod h1:rnDN1CpKP9iJXwxRtnvM7d5wdPHQY0K5NkHeXWPlQ+o=
+github.com/SpectoLabs/raymond v2.0.2+incompatible h1:75q2/r2f6U38xSTDHUbJWZnkVY9dKUeQi8M9HMa1icc=
+github.com/SpectoLabs/raymond v2.0.2+incompatible/go.mod h1:Cv+3TFLm3T7C7ML7gEK4HnHcTpfc4HjJFWvS91cc6tw=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/antonholmquist/jason v1.0.1-0.20160829104012-962e09b85496 h1:dESITdufxuiwgQh1YPiPupEXORHTYvY8tr40nvrWelo=
 github.com/antonholmquist/jason v1.0.1-0.20160829104012-962e09b85496/go.mod h1:+GxMEKI0Va2U8h3os6oiUAetHAlGMvxjdpAH/9uvUMA=

diff --git a/...r/github.com/aymerick/raymond/.gitmodules → ...github.com/SpectoLabs/raymond/.gitmodules b/...r/github.com/aymerick/raymond/.gitmodules → ...github.com/SpectoLabs/raymond/.gitmodules
diff --git a/...r/github.com/aymerick/raymond/.travis.yml → ...github.com/SpectoLabs/raymond/.travis.yml b/...r/github.com/aymerick/raymond/.travis.yml → ...github.com/SpectoLabs/raymond/.travis.yml
diff --git a/...github.com/aymerick/raymond/BENCHMARKS.md → ...thub.com/SpectoLabs/raymond/BENCHMARKS.md b/...github.com/aymerick/raymond/BENCHMARKS.md → ...thub.com/SpectoLabs/raymond/BENCHMARKS.md
diff --git a/.../github.com/aymerick/raymond/CHANGELOG.md → ...ithub.com/SpectoLabs/raymond/CHANGELOG.md b/.../github.com/aymerick/raymond/CHANGELOG.md → ...ithub.com/SpectoLabs/raymond/CHANGELOG.md
diff --git a/vendor/github.com/SpectoLabs/raymond/LICENSE b/vendor/github.com/SpectoLabs/raymond/LICENSE
diff --git a/vendor/github.com/aymerick/raymond/README.md → ...r/github.com/SpectoLabs/raymond/README.md b/vendor/github.com/aymerick/raymond/README.md → ...r/github.com/SpectoLabs/raymond/README.md
diff --git a/vendor/github.com/aymerick/raymond/VERSION → vendor/github.com/SpectoLabs/raymond/VERSION b/vendor/github.com/aymerick/raymond/VERSION → vendor/github.com/SpectoLabs/raymond/VERSION
diff --git a/...github.com/aymerick/raymond/data_frame.go → ...thub.com/SpectoLabs/raymond/data_frame.go b/...github.com/aymerick/raymond/data_frame.go → ...thub.com/SpectoLabs/raymond/data_frame.go
diff --git a/vendor/github.com/aymerick/raymond/escape.go → ...r/github.com/SpectoLabs/raymond/escape.go b/vendor/github.com/aymerick/raymond/escape.go → ...r/github.com/SpectoLabs/raymond/escape.go
diff --git a/vendor/github.com/aymerick/raymond/eval.go → vendor/github.com/SpectoLabs/raymond/eval.go b/vendor/github.com/aymerick/raymond/eval.go → vendor/github.com/SpectoLabs/raymond/eval.go
diff --git a/vendor/github.com/aymerick/raymond/helper.go → ...r/github.com/SpectoLabs/raymond/helper.go b/vendor/github.com/aymerick/raymond/helper.go → ...r/github.com/SpectoLabs/raymond/helper.go
diff --git a/...or/github.com/aymerick/raymond/partial.go → .../github.com/SpectoLabs/raymond/partial.go b/...or/github.com/aymerick/raymond/partial.go → .../github.com/SpectoLabs/raymond/partial.go
diff --git a/...or/github.com/aymerick/raymond/raymond.go → .../github.com/SpectoLabs/raymond/raymond.go b/...or/github.com/aymerick/raymond/raymond.go → .../github.com/SpectoLabs/raymond/raymond.go
diff --git a/...r/github.com/aymerick/raymond/raymond.png → ...github.com/SpectoLabs/raymond/raymond.png b/...r/github.com/aymerick/raymond/raymond.png → ...github.com/SpectoLabs/raymond/raymond.png
diff --git a/vendor/github.com/aymerick/raymond/string.go → ...r/github.com/SpectoLabs/raymond/string.go b/vendor/github.com/aymerick/raymond/string.go → ...r/github.com/SpectoLabs/raymond/string.go
diff --git a/...r/github.com/aymerick/raymond/template.go → ...github.com/SpectoLabs/raymond/template.go b/...r/github.com/aymerick/raymond/template.go → ...github.com/SpectoLabs/raymond/template.go
diff --git a/vendor/github.com/aymerick/raymond/utils.go → ...or/github.com/SpectoLabs/raymond/utils.go b/vendor/github.com/aymerick/raymond/utils.go → ...or/github.com/SpectoLabs/raymond/utils.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -21,12 +21,14 @@ github.com/SpectoLabs/goproxy
 # github.com/SpectoLabs/goproxy/ext v0.0.0-20220724221645-71c396c297b7
 ## explicit
 github.com/SpectoLabs/goproxy/ext/auth
+# github.com/SpectoLabs/raymond v2.0.2+incompatible
+## explicit
+github.com/SpectoLabs/raymond
 # github.com/antonholmquist/jason v1.0.1-0.20160829104012-962e09b85496
 ## explicit
 github.com/antonholmquist/jason
 # github.com/aymerick/raymond v2.0.2+incompatible
 ## explicit
-github.com/aymerick/raymond
 github.com/aymerick/raymond/ast
 github.com/aymerick/raymond/lexer
 github.com/aymerick/raymond/parser