diff --git a/go.mod b/go.mod index 1de4e6aa..68f8ab0b 100644 --- a/go.mod +++ b/go.mod @@ -15,14 +15,13 @@ require ( github.com/mattn/go-sqlite3 v1.14.14 github.com/moogar0880/problems v0.1.1 github.com/open-policy-agent/opa v0.43.1 - github.com/spf13/cobra v1.5.0 - github.com/spf13/viper v1.13.0 + github.com/setrofim/viper v0.0.0-20220929140858-add5a281c9db github.com/stretchr/testify v1.8.0 github.com/veraison/corim v0.0.0-20220801100627-a48aacbd333c github.com/veraison/dice v0.0.1 github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff github.com/veraison/psatoken v0.0.2-0.20220729120948-5bec1d03670c - google.golang.org/grpc v1.48.0 + google.golang.org/grpc v1.49.0 google.golang.org/protobuf v1.28.0 ) @@ -45,7 +44,6 @@ require ( github.com/hashicorp/go-hclog v1.2.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect @@ -67,7 +65,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -81,11 +79,11 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yashtewari/glob-intersection v0.1.0 // indirect golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect - golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect + golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect + golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect + google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 8dafda6c..1f094db3 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,6 @@ github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw= @@ -957,6 +955,8 @@ github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvW github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/setrofim/viper v0.0.0-20220929140858-add5a281c9db h1:5+Le1N9aPGBqcTYlSQp+5D97Cw3buUYWdkEdLlCwTMg= +github.com/setrofim/viper v0.0.0-20220929140858-add5a281c9db/go.mod h1:vMrVjiy4fuGY9YEdvIPXTvVLCyUzE8x3LzjRCjYV5EA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= @@ -978,8 +978,8 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -992,7 +992,6 @@ github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHN github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= @@ -1008,8 +1007,6 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= -github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= -github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -1280,8 +1277,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1426,8 +1423,9 @@ golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1625,8 +1623,8 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f h1:hJ/Y5SqPXbarffmAsApliUlcvMU+wScNGfyop4bZm8o= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1659,8 +1657,10 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= +google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/kvstore/ikvstore.go b/kvstore/ikvstore.go index b34402be..dde73382 100644 --- a/kvstore/ikvstore.go +++ b/kvstore/ikvstore.go @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package kvstore -import "github.com/spf13/viper" +import "github.com/setrofim/viper" // IKVStore is the interface to a key-value store. Keys and values are both // strings. A key can be associated with multiple values. diff --git a/kvstore/kvstore.go b/kvstore/kvstore.go index b15be4de..2d4b6e48 100644 --- a/kvstore/kvstore.go +++ b/kvstore/kvstore.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/spf13/viper" + "github.com/setrofim/viper" ) func New(v *viper.Viper) (IKVStore, error) { diff --git a/kvstore/kvstore_test.go b/kvstore/kvstore_test.go index 61e55387..c598d0ee 100644 --- a/kvstore/kvstore_test.go +++ b/kvstore/kvstore_test.go @@ -5,7 +5,7 @@ package kvstore import ( "testing" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/stretchr/testify/assert" ) diff --git a/kvstore/memory.go b/kvstore/memory.go index 1bd1d09f..4f44a0c8 100644 --- a/kvstore/memory.go +++ b/kvstore/memory.go @@ -10,7 +10,7 @@ import ( "sync" "text/tabwriter" - "github.com/spf13/viper" + "github.com/setrofim/viper" ) var ( diff --git a/kvstore/sql.go b/kvstore/sql.go index 4d1b62ec..08a27c8c 100644 --- a/kvstore/sql.go +++ b/kvstore/sql.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "github.com/spf13/viper" + "github.com/setrofim/viper" ) var ( diff --git a/kvstore/sql_test.go b/kvstore/sql_test.go index 82ae49cb..33174860 100644 --- a/kvstore/sql_test.go +++ b/kvstore/sql_test.go @@ -11,7 +11,7 @@ import ( sqlmock "github.com/DATA-DOG/go-sqlmock" _ "github.com/mattn/go-sqlite3" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/policy/agent.go b/policy/agent.go index ec0f9cda..07c4723c 100644 --- a/policy/agent.go +++ b/policy/agent.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/proto" ) diff --git a/policy/agent_test.go b/policy/agent_test.go index de2df311..9fd88cdf 100644 --- a/policy/agent_test.go +++ b/policy/agent_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" mock_deps "github.com/veraison/services/policy/mocks" diff --git a/policy/iagent.go b/policy/iagent.go index 15a8e56f..0217aa27 100644 --- a/policy/iagent.go +++ b/policy/iagent.go @@ -3,7 +3,7 @@ package policy import ( "context" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/proto" ) diff --git a/policy/ibackend.go b/policy/ibackend.go index 4d969e0f..e8153903 100644 --- a/policy/ibackend.go +++ b/policy/ibackend.go @@ -3,7 +3,7 @@ package policy import ( "context" - "github.com/spf13/viper" + "github.com/setrofim/viper" ) type IBackend interface { diff --git a/policy/mocks/mock_ibackend.go b/policy/mocks/mock_ibackend.go index a6d65dd4..9dd7b508 100644 --- a/policy/mocks/mock_ibackend.go +++ b/policy/mocks/mock_ibackend.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - viper "github.com/spf13/viper" + viper "github.com/setrofim/viper" ) // MockIBackend is a mock of IBackend interface. diff --git a/policy/opa.go b/policy/opa.go index 3408490e..477b91f6 100644 --- a/policy/opa.go +++ b/policy/opa.go @@ -11,7 +11,7 @@ import ( "log" "github.com/open-policy-agent/opa/rego" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/proto" ) diff --git a/policy/store.go b/policy/store.go index 4a088cc9..cad938f1 100644 --- a/policy/store.go +++ b/policy/store.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/kvstore" ) diff --git a/policy/store_test.go b/policy/store_test.go index d7ae391a..14ba41ab 100644 --- a/policy/store_test.go +++ b/policy/store_test.go @@ -5,7 +5,7 @@ package policy import ( "testing" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/provisioning/cmd/main.go b/provisioning/cmd/main.go index 0f48e6b9..08aeb3fa 100644 --- a/provisioning/cmd/main.go +++ b/provisioning/cmd/main.go @@ -10,7 +10,7 @@ import ( "os/signal" "syscall" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/provisioning/api" "github.com/veraison/services/provisioning/decoder" "github.com/veraison/services/vtsclient" diff --git a/verification/cmd/main.go b/verification/cmd/main.go index f3fd5ce6..25b4bad7 100644 --- a/verification/cmd/main.go +++ b/verification/cmd/main.go @@ -4,7 +4,7 @@ import ( "log" "os" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/verification/api" "github.com/veraison/services/verification/sessionmanager" "github.com/veraison/services/verification/verifier" diff --git a/verification/verifier/verifier.go b/verification/verifier/verifier.go index 3f5d2001..a72dc575 100644 --- a/verification/verifier/verifier.go +++ b/verification/verifier/verifier.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/proto" "github.com/veraison/services/vtsclient" "google.golang.org/protobuf/types/known/emptypb" diff --git a/vts/cmd/main.go b/vts/cmd/main.go index 394f48fa..def4d143 100644 --- a/vts/cmd/main.go +++ b/vts/cmd/main.go @@ -9,7 +9,7 @@ import ( "syscall" _ "github.com/mattn/go-sqlite3" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/kvstore" "github.com/veraison/services/policy" diff --git a/vts/pluginmanager/pluginmanager_goplugin.go b/vts/pluginmanager/pluginmanager_goplugin.go index 73a28557..b74b2dbb 100644 --- a/vts/pluginmanager/pluginmanager_goplugin.go +++ b/vts/pluginmanager/pluginmanager_goplugin.go @@ -8,7 +8,7 @@ import ( "log" "github.com/hashicorp/go-plugin" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/proto" "github.com/veraison/services/scheme" ) diff --git a/vts/policymanager/mocks/iagent.go b/vts/policymanager/mocks/iagent.go index 6cb0f244..00cdbbb3 100644 --- a/vts/policymanager/mocks/iagent.go +++ b/vts/policymanager/mocks/iagent.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - viper "github.com/spf13/viper" + viper "github.com/setrofim/viper" policy "github.com/veraison/services/policy" proto "github.com/veraison/services/proto" ) diff --git a/vts/policymanager/mocks/ibackend.go b/vts/policymanager/mocks/ibackend.go index 7ade4588..4f8a9289 100644 --- a/vts/policymanager/mocks/ibackend.go +++ b/vts/policymanager/mocks/ibackend.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - viper "github.com/spf13/viper" + viper "github.com/setrofim/viper" ) // MockIBackend is a mock of IBackend interface. diff --git a/vts/policymanager/mocks/ikvstore.go b/vts/policymanager/mocks/ikvstore.go index 899b5630..bb8a2fb5 100644 --- a/vts/policymanager/mocks/ikvstore.go +++ b/vts/policymanager/mocks/ikvstore.go @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - viper "github.com/spf13/viper" + viper "github.com/setrofim/viper" ) // MockIKVStore is a mock of IKVStore interface. diff --git a/vts/policymanager/policymanager.go b/vts/policymanager/policymanager.go index 5060b701..5b608e9c 100644 --- a/vts/policymanager/policymanager.go +++ b/vts/policymanager/policymanager.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/policy" "github.com/veraison/services/proto" ) diff --git a/vts/policymanager/policymanager_test.go b/vts/policymanager/policymanager_test.go index 73a40bf7..d22bb5e2 100644 --- a/vts/policymanager/policymanager_test.go +++ b/vts/policymanager/policymanager_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/veraison/services/kvstore" diff --git a/vts/trustedservices/trustedservices_grpc.go b/vts/trustedservices/trustedservices_grpc.go index 3b056e78..6c1bf1e3 100644 --- a/vts/trustedservices/trustedservices_grpc.go +++ b/vts/trustedservices/trustedservices_grpc.go @@ -10,7 +10,7 @@ import ( "log" "net" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/kvstore" "github.com/veraison/services/proto" "github.com/veraison/services/scheme" diff --git a/vtsclient/vtsclient_grpc.go b/vtsclient/vtsclient_grpc.go index 360bbe3f..4fa51727 100644 --- a/vtsclient/vtsclient_grpc.go +++ b/vtsclient/vtsclient_grpc.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/spf13/viper" + "github.com/setrofim/viper" "github.com/veraison/services/proto" "github.com/veraison/services/vts/trustedservices" "google.golang.org/grpc"