diff --git a/go.mod b/go.mod index 3b554d6f..d77d9093 100644 --- a/go.mod +++ b/go.mod @@ -6,13 +6,18 @@ require ( github.com/go-sql-driver/mysql v1.7.1 github.com/julienschmidt/httprouter v1.3.0 github.com/lib/pq v1.10.9 - github.com/madflojo/hord v0.3.0 github.com/madflojo/tasks v1.2.0 github.com/madflojo/testcerts v1.2.0 github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 github.com/prometheus/client_golang v1.19.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/viper v1.19.0 + github.com/tarmac-project/hord v0.6.0 + github.com/tarmac-project/hord/drivers/bbolt v0.6.0 + github.com/tarmac-project/hord/drivers/cassandra v0.6.0 + github.com/tarmac-project/hord/drivers/hashmap v0.6.0 + github.com/tarmac-project/hord/drivers/mock v0.6.0 + github.com/tarmac-project/hord/drivers/redis v0.6.0 github.com/tarmac-project/wapc-toolkit v0.1.2 github.com/wapc/wapc-go v0.7.0 ) @@ -82,7 +87,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/tetratelabs/wazero v1.7.3 // indirect - go.etcd.io/bbolt v1.3.9 // indirect + go.etcd.io/bbolt v1.3.10 // indirect go.etcd.io/etcd/api/v3 v3.5.12 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect go.etcd.io/etcd/client/v2 v2.305.12 // indirect diff --git a/go.sum b/go.sum index 9c3c2ee3..8dc5e50e 100644 --- a/go.sum +++ b/go.sum @@ -199,8 +199,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/madflojo/hord v0.3.0 h1:uq1u2EiOhKhiA7vSLm22I54MxUOTYaD0A8Btf62+iwM= -github.com/madflojo/hord v0.3.0/go.mod h1:wXy4XFyefuQIRSuVyNQJkfJVDRpXGv23yElKuBQUdoY= github.com/madflojo/tasks v1.2.0 h1:wYVgHx293eFFN2xtfsgNQ8T4LUPZEdnGH5jvLn3B7kg= github.com/madflojo/tasks v1.2.0/go.mod h1:BKSfcHnUSlQMA5wXdaxgthhKc75GfVIivEywn2YWqt0= github.com/madflojo/testcerts v1.2.0 h1:/ng1zJW1G9aM3ez9RXA3dYKT6INc/rc4GpRgqDl/XJw= @@ -329,6 +327,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tarmac-project/hord v0.6.0 h1:ifrJ6aUV2N9I+YAPnFvMO2eMgjE/Ki+ixaXUFAHEJTI= +github.com/tarmac-project/hord v0.6.0/go.mod h1:b46vLVFfL9G/WG5BYNTNoordvQ9wQ+ibs1/Fn4v0vkE= +github.com/tarmac-project/hord/drivers/bbolt v0.6.0 h1:Ra/ZhtU379mXAVwGN/Kt2E5E+ijEPdhaOIapgTwsyOk= +github.com/tarmac-project/hord/drivers/bbolt v0.6.0/go.mod h1:l3oDMXeELlMRjGYpavVw0R22faj6DI3raBLDe3iimME= +github.com/tarmac-project/hord/drivers/cassandra v0.6.0 h1:G5BEUUqxBzR7KihEP4Mu6yVnNsasS422CWtEuGgnHPc= +github.com/tarmac-project/hord/drivers/cassandra v0.6.0/go.mod h1:PZnd1Y5IBxBL86WirD63wD6UDaBZeRML7QvQLgvTQ2w= +github.com/tarmac-project/hord/drivers/hashmap v0.6.0 h1:B0qvQGGxylYEmDFEW0zbYuLyi0YekQy+3B/QfOpi+34= +github.com/tarmac-project/hord/drivers/hashmap v0.6.0/go.mod h1:omkFLNmyQrT0koqI8Ji4eswU1Ou8af+EMMuKSumV85Q= +github.com/tarmac-project/hord/drivers/mock v0.6.0 h1:8XWfpW9I16TN1ycSRf/JU+0Oq+NuFxHlhFCe2MXaohw= +github.com/tarmac-project/hord/drivers/mock v0.6.0/go.mod h1:B3kPMdUK3M2OoSPktP9Dm+JrllW2DMDeHeUGa41CNzc= +github.com/tarmac-project/hord/drivers/redis v0.6.0 h1:jqRydEdOGQxo2GUspOmNk77ebuQkfgYsCMMZ1aRM0io= +github.com/tarmac-project/hord/drivers/redis v0.6.0/go.mod h1:dZyQBCqPLmYsXd2kbW1H4pqCWgjFZXTN4xZm36+qF6M= github.com/tarmac-project/wapc-toolkit v0.1.2 h1:yl6F3sLjYgHcyfnmtIUPmJhRkw+SLODUUFTc9q6sZ5Y= github.com/tarmac-project/wapc-toolkit v0.1.2/go.mod h1:AnPYK2iWP+cDYHAskjcecoERt/2Bz+PEODdVzricE0o= github.com/tetratelabs/wazero v1.7.3 h1:PBH5KVahrt3S2AHgEjKu4u+LlDbbk+nsGE3KLucy6Rw= @@ -343,8 +353,8 @@ github.com/wasmerio/wasmer-go v1.0.4/go.mod h1:0gzVdSfg6pysA6QVp6iVRPTagC6Wq9pOE github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= -go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= +go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= +go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c= go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A= diff --git a/pkg/app/app.go b/pkg/app/app.go index fec5181b..a8f9e501 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -20,15 +20,15 @@ import ( // PostgreSQL Database Driver _ "github.com/lib/pq" - "github.com/madflojo/hord" - "github.com/madflojo/hord/drivers/bbolt" - "github.com/madflojo/hord/drivers/cassandra" - "github.com/madflojo/hord/drivers/hashmap" - "github.com/madflojo/hord/drivers/redis" "github.com/madflojo/tasks" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" "github.com/spf13/viper" + "github.com/tarmac-project/hord" + "github.com/tarmac-project/hord/drivers/bbolt" + "github.com/tarmac-project/hord/drivers/cassandra" + "github.com/tarmac-project/hord/drivers/hashmap" + "github.com/tarmac-project/hord/drivers/redis" "github.com/tarmac-project/tarmac/pkg/callbacks/httpclient" "github.com/tarmac-project/tarmac/pkg/callbacks/kvstore" "github.com/tarmac-project/tarmac/pkg/callbacks/logging" diff --git a/pkg/callbacks/kvstore/kvstore.go b/pkg/callbacks/kvstore/kvstore.go index 2e69d816..31bb38da 100644 --- a/pkg/callbacks/kvstore/kvstore.go +++ b/pkg/callbacks/kvstore/kvstore.go @@ -23,8 +23,8 @@ import ( "encoding/base64" "fmt" - "github.com/madflojo/hord" "github.com/pquerna/ffjson/ffjson" + "github.com/tarmac-project/hord" "github.com/tarmac-project/tarmac" ) @@ -32,7 +32,7 @@ import ( // within KVStore provided all of the logic and error handlings of accessing and interacting with a key:value // database. Users will send the specified JSON request and receive an appropriate JSON response. type KVStore struct { - // KV is the user-provided Key:Value store instance using the github.com/madflojo/hord package. This package by + // KV is the user-provided Key:Value store instance using the github.com/tarmac-project/hord package. This package by // itself does not manage database connections but rather relies on the hord.Database interface. Users must // supply an initiated hord.Database to work with. kv hord.Database @@ -41,7 +41,7 @@ type KVStore struct { // Config is provided to users to configure the Host Callback. All Tarmac Callbacks follow the same configuration // format; each Config struct gives the specific Host Callback unique functionality. type Config struct { - // KV is the user-provided Key:Value store instance using the github.com/madflojo/hord package. This package by + // KV is the user-provided Key:Value store instance using the github.com/tarmac-project/hord package. This package by // itself does not manage database connections but rather relies on the hord.Database interface. Users must // supply an initiated hord.Database to work with. KV hord.Database diff --git a/pkg/callbacks/kvstore/kvstore_test.go b/pkg/callbacks/kvstore/kvstore_test.go index c79d2563..ce809f50 100644 --- a/pkg/callbacks/kvstore/kvstore_test.go +++ b/pkg/callbacks/kvstore/kvstore_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/madflojo/hord/drivers/mock" "github.com/pquerna/ffjson/ffjson" + "github.com/tarmac-project/hord/drivers/mock" "github.com/tarmac-project/tarmac" )