diff --git a/core/hoverfly_funcs.go b/core/hoverfly_funcs.go index 660a0ea6e..f8549b719 100644 --- 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 index 419df470f..4cf91bb2c 100644 --- 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 index 6a12d4bc9..f688e4b6a 100644 --- 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 index 846eac5c3..26cfe2842 100644 --- 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 index 70fe469c4..697ec2ef5 100644 --- 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 index 705deca08..e60d422c0 100644 --- 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 index 7b0c88f9f..420a9ff7a 100644 --- 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/vendor/github.com/aymerick/raymond/.gitmodules b/vendor/github.com/SpectoLabs/raymond/.gitmodules similarity index 100% rename from vendor/github.com/aymerick/raymond/.gitmodules rename to vendor/github.com/SpectoLabs/raymond/.gitmodules diff --git a/vendor/github.com/aymerick/raymond/.travis.yml b/vendor/github.com/SpectoLabs/raymond/.travis.yml similarity index 100% rename from vendor/github.com/aymerick/raymond/.travis.yml rename to vendor/github.com/SpectoLabs/raymond/.travis.yml diff --git a/vendor/github.com/aymerick/raymond/BENCHMARKS.md b/vendor/github.com/SpectoLabs/raymond/BENCHMARKS.md similarity index 100% rename from vendor/github.com/aymerick/raymond/BENCHMARKS.md rename to vendor/github.com/SpectoLabs/raymond/BENCHMARKS.md diff --git a/vendor/github.com/aymerick/raymond/CHANGELOG.md b/vendor/github.com/SpectoLabs/raymond/CHANGELOG.md similarity index 100% rename from vendor/github.com/aymerick/raymond/CHANGELOG.md rename to vendor/github.com/SpectoLabs/raymond/CHANGELOG.md diff --git a/vendor/github.com/SpectoLabs/raymond/LICENSE b/vendor/github.com/SpectoLabs/raymond/LICENSE new file mode 100644 index 000000000..6ce87cd37 --- /dev/null +++ b/vendor/github.com/SpectoLabs/raymond/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Aymerick JEHANNE + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/vendor/github.com/aymerick/raymond/README.md b/vendor/github.com/SpectoLabs/raymond/README.md similarity index 100% rename from vendor/github.com/aymerick/raymond/README.md rename to vendor/github.com/SpectoLabs/raymond/README.md diff --git a/vendor/github.com/aymerick/raymond/VERSION b/vendor/github.com/SpectoLabs/raymond/VERSION similarity index 100% rename from vendor/github.com/aymerick/raymond/VERSION rename to vendor/github.com/SpectoLabs/raymond/VERSION diff --git a/vendor/github.com/aymerick/raymond/data_frame.go b/vendor/github.com/SpectoLabs/raymond/data_frame.go similarity index 100% rename from vendor/github.com/aymerick/raymond/data_frame.go rename to vendor/github.com/SpectoLabs/raymond/data_frame.go diff --git a/vendor/github.com/aymerick/raymond/escape.go b/vendor/github.com/SpectoLabs/raymond/escape.go similarity index 100% rename from vendor/github.com/aymerick/raymond/escape.go rename to vendor/github.com/SpectoLabs/raymond/escape.go diff --git a/vendor/github.com/aymerick/raymond/eval.go b/vendor/github.com/SpectoLabs/raymond/eval.go similarity index 100% rename from vendor/github.com/aymerick/raymond/eval.go rename to vendor/github.com/SpectoLabs/raymond/eval.go diff --git a/vendor/github.com/aymerick/raymond/helper.go b/vendor/github.com/SpectoLabs/raymond/helper.go similarity index 100% rename from vendor/github.com/aymerick/raymond/helper.go rename to vendor/github.com/SpectoLabs/raymond/helper.go diff --git a/vendor/github.com/aymerick/raymond/partial.go b/vendor/github.com/SpectoLabs/raymond/partial.go similarity index 100% rename from vendor/github.com/aymerick/raymond/partial.go rename to vendor/github.com/SpectoLabs/raymond/partial.go diff --git a/vendor/github.com/aymerick/raymond/raymond.go b/vendor/github.com/SpectoLabs/raymond/raymond.go similarity index 100% rename from vendor/github.com/aymerick/raymond/raymond.go rename to vendor/github.com/SpectoLabs/raymond/raymond.go diff --git a/vendor/github.com/aymerick/raymond/raymond.png b/vendor/github.com/SpectoLabs/raymond/raymond.png similarity index 100% rename from vendor/github.com/aymerick/raymond/raymond.png rename to vendor/github.com/SpectoLabs/raymond/raymond.png diff --git a/vendor/github.com/aymerick/raymond/string.go b/vendor/github.com/SpectoLabs/raymond/string.go similarity index 100% rename from vendor/github.com/aymerick/raymond/string.go rename to vendor/github.com/SpectoLabs/raymond/string.go diff --git a/vendor/github.com/aymerick/raymond/template.go b/vendor/github.com/SpectoLabs/raymond/template.go similarity index 100% rename from vendor/github.com/aymerick/raymond/template.go rename to vendor/github.com/SpectoLabs/raymond/template.go diff --git a/vendor/github.com/aymerick/raymond/utils.go b/vendor/github.com/SpectoLabs/raymond/utils.go similarity index 100% rename from vendor/github.com/aymerick/raymond/utils.go rename to vendor/github.com/SpectoLabs/raymond/utils.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 3a0dfe9e7..9f7224d6b 100644 --- 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