diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..95ef010 --- /dev/null +++ b/go.mod @@ -0,0 +1,58 @@ +module github.com/kong/go-database-reconciler + +go 1.21.1 + +replace github.com/yudai/gojsondiff v1.0.0 => github.com/Kong/gojsondiff v1.3.0 + +require ( + dario.cat/mergo v1.0.0 + github.com/Kong/gojsondiff v1.3.2 + github.com/alecthomas/jsonschema v0.0.0-20191017121752-4bb6e3fae4f2 + github.com/blang/semver/v4 v4.0.0 + github.com/cenkalti/backoff/v4 v4.2.1 + github.com/fatih/color v1.16.0 + github.com/google/go-cmp v0.6.0 + github.com/google/go-querystring v1.1.0 + github.com/google/uuid v1.4.0 + github.com/hashicorp/go-memdb v1.3.4 + github.com/hashicorp/go-retryablehttp v0.7.5 + github.com/hexops/gotextdiff v1.0.3 + github.com/kong/go-kong v0.48.0 + github.com/shirou/gopsutil/v3 v3.23.10 + github.com/ssgelm/cookiejarparser v1.0.1 + github.com/stretchr/testify v1.8.4 + github.com/xeipuuv/gojsonschema v1.2.0 + golang.org/x/sync v0.5.0 + sigs.k8s.io/yaml v1.4.0 +) + +require ( + github.com/Kong/go-diff v1.2.2 // indirect + github.com/adrg/strutil v0.2.3 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-immutable-radix v1.3.0 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/kong/semver/v4 v4.0.1 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/tidwall/gjson v1.17.0 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/yudai/golcs v0.0.0-20150405163532-d1c525dea8ce // indirect + github.com/yusufpapurcu/wmi v1.2.3 // indirect + golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a // indirect + golang.org/x/sys v0.14.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..5287b99 --- /dev/null +++ b/go.sum @@ -0,0 +1,147 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/Kong/go-diff v1.2.2 h1:KKKaqHc8IxuguFVIZMNt3bi6YuC/t9r7BGD8bOOpSgM= +github.com/Kong/go-diff v1.2.2/go.mod h1:nlvdwVZQk3Rm+tbI0cDmKFrOjghtcZTrZBp+UruvvA8= +github.com/Kong/gojsondiff v1.3.2 h1:qIOVq2mUXt+NXy8Be5gRUee9TP3Ve0MbQSafg9bXKZE= +github.com/Kong/gojsondiff v1.3.2/go.mod h1:DiIxtU59q4alK7ecP+7k56C5UjgOviJ5gQVR2esEhYw= +github.com/adrg/strutil v0.2.3 h1:WZVn3ItPBovFmP4wMHHVXUr8luRaHrbyIuLlHt32GZQ= +github.com/adrg/strutil v0.2.3/go.mod h1:+SNxbiH6t+O+5SZqIj5n/9i5yUjR+S3XXVrjEcN2mxg= +github.com/alecthomas/jsonschema v0.0.0-20191017121752-4bb6e3fae4f2 h1:swGeCLPiUQ647AIRnFxnAHdzlg6IPpmU6QdkOPZINt8= +github.com/alecthomas/jsonschema v0.0.0-20191017121752-4bb6e3fae4f2/go.mod h1:Juc2PrI3wtNfUwptSvAIeNx+HrETwHQs6nf+TkOJlOA= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE= +github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c= +github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg= +github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M= +github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= +github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/kong/go-kong v0.48.0 h1:vK1OpoxO50qlKdwPfmx9ChvkTKRsoCCB3b3iHo1umLc= +github.com/kong/go-kong v0.48.0/go.mod h1:qH4CEFqT83ywmu1TlMZX09clQH4B8/dX88CtT/jdv/E= +github.com/kong/semver/v4 v4.0.1 h1:DIcNR8W3gfx0KabFBADPalxxsp+q/5COwIFkkhrFQ2Y= +github.com/kong/semver/v4 v4.0.1/go.mod h1:LImQ0oT15pJvSns/hs2laLca2zcYoHu5EsSNY0J6/QA= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/onsi/ginkgo v1.1.1-0.20150303023352-38caab951a9f h1:znMoXRti03ZIy/gaW5cl3EO2A5zqzHBKA6uMnrAQDE0= +github.com/onsi/ginkgo v1.1.1-0.20150303023352-38caab951a9f/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v0.0.0-20150401040250-4dfabf7db2e4 h1:vXLCFNIK5zI1YgKSvgc5qXOvegcGfwvQ4G3hgFCA11A= +github.com/onsi/gomega v0.0.0-20150401040250-4dfabf7db2e4/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= +github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/ssgelm/cookiejarparser v1.0.1 h1:cRdXauUbOTFzTPJFaeiWbHnQ+tRGlpKKzvIK9PUekE4= +github.com/ssgelm/cookiejarparser v1.0.1/go.mod h1:DUfC0mpjIzlDN7DzKjXpHj0qMI5m9VrZuz3wSlI+OEI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= +github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= +github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= +github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/yudai/golcs v0.0.0-20150405163532-d1c525dea8ce h1:888GrqRxabUce7lj4OaoShPxodm3kXOMpSa85wdYzfY= +github.com/yudai/golcs v0.0.0-20150405163532-d1c525dea8ce/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.2-0.20150410014804-be8315415630+incompatible h1:TmF93o7P81230DTx1l2zw5rZbsDpOOQXoKVCa8+nXXI= +github.com/yudai/pp v2.0.2-0.20150410014804-be8315415630+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= +github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= +github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a h1:Yu34BogBivvmu7SAzHHaB9nZWH5D1C+z3F1jyIaYZSQ= +golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go index 48f7307..e4a8eb3 100644 --- a/pkg/diff/diff.go +++ b/pkg/diff/diff.go @@ -10,12 +10,12 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/kong/deck/cprint" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" - "github.com/kong/deck/types" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/cprint" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/types" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/diff/diff_helpers.go b/pkg/diff/diff_helpers.go index 9dbdf4c..1ecb263 100644 --- a/pkg/diff/diff_helpers.go +++ b/pkg/diff/diff_helpers.go @@ -12,7 +12,7 @@ import ( "github.com/hexops/gotextdiff" "github.com/hexops/gotextdiff/myers" "github.com/hexops/gotextdiff/span" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/state" ) var differ = gojsondiff.New() diff --git a/pkg/diff/diff_helpers_test.go b/pkg/diff/diff_helpers_test.go index 82f26c1..15bda71 100644 --- a/pkg/diff/diff_helpers_test.go +++ b/pkg/diff/diff_helpers_test.go @@ -3,8 +3,8 @@ package diff import ( "testing" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/diff/order.go b/pkg/diff/order.go index 064ed5d..73424e8 100644 --- a/pkg/diff/order.go +++ b/pkg/diff/order.go @@ -1,8 +1,8 @@ package diff import ( - "github.com/kong/deck/crud" - "github.com/kong/deck/types" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/types" ) /* diff --git a/pkg/diff/order_test.go b/pkg/diff/order_test.go index a923981..18c404b 100644 --- a/pkg/diff/order_test.go +++ b/pkg/diff/order_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/kong/deck/crud" - "github.com/kong/deck/types" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/types" "github.com/stretchr/testify/require" ) diff --git a/pkg/dump/dump.go b/pkg/dump/dump.go index eeb59d4..1a22528 100644 --- a/pkg/dump/dump.go +++ b/pkg/dump/dump.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" "golang.org/x/sync/errgroup" ) diff --git a/pkg/dump/dump_konnect.go b/pkg/dump/dump_konnect.go index 3e8b50d..cd4ef04 100644 --- a/pkg/dump/dump_konnect.go +++ b/pkg/dump/dump_konnect.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "github.com/kong/deck/konnect" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/pkg/dump/dump_konnect_test.go b/pkg/dump/dump_konnect_test.go index ad609f2..8315b81 100644 --- a/pkg/dump/dump_konnect_test.go +++ b/pkg/dump/dump_konnect_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/kong/deck/konnect" + "github.com/kong/go-database-reconciler/pkg/konnect" "github.com/kong/go-kong/kong" ) diff --git a/pkg/file/builder.go b/pkg/file/builder.go index f70cc79..df9a26d 100644 --- a/pkg/file/builder.go +++ b/pkg/file/builder.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/blang/semver/v4" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/file/builder_test.go b/pkg/file/builder_test.go index 1b79c28..d16f783 100644 --- a/pkg/file/builder_test.go +++ b/pkg/file/builder_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/blang/semver/v4" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" ) diff --git a/pkg/file/codegen/main.go b/pkg/file/codegen/main.go index b9d5cac..4506d50 100644 --- a/pkg/file/codegen/main.go +++ b/pkg/file/codegen/main.go @@ -7,7 +7,7 @@ import ( "reflect" "github.com/alecthomas/jsonschema" - "github.com/kong/deck/file" + "github.com/kong/go-database-reconciler/pkg/file" "github.com/kong/go-kong/kong" ) diff --git a/pkg/file/konnect.go b/pkg/file/konnect.go index 46b4abe..5081b2c 100644 --- a/pkg/file/konnect.go +++ b/pkg/file/konnect.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/file/reader.go b/pkg/file/reader.go index ad0c2b8..7f9a917 100644 --- a/pkg/file/reader.go +++ b/pkg/file/reader.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/blang/semver/v4" - "github.com/kong/deck/dump" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/dump" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/file/reader_test.go b/pkg/file/reader_test.go index aae4861..ae62df6 100644 --- a/pkg/file/reader_test.go +++ b/pkg/file/reader_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/kong/deck/dump" + "github.com/kong/go-database-reconciler/pkg/dump" "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" ) diff --git a/pkg/file/readfile.go b/pkg/file/readfile.go index 165f7b6..f626732 100644 --- a/pkg/file/readfile.go +++ b/pkg/file/readfile.go @@ -11,8 +11,8 @@ import ( "strings" "text/template" - "github.com/imdario/mergo" - "github.com/kong/deck/utils" + "dario.cat/mergo" + "github.com/kong/go-database-reconciler/pkg/utils" "sigs.k8s.io/yaml" ) diff --git a/pkg/file/readfile_test.go b/pkg/file/readfile_test.go index 573f0aa..4e4941c 100644 --- a/pkg/file/readfile_test.go +++ b/pkg/file/readfile_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/file/types.go b/pkg/file/types.go index d70b60e..2974fd7 100644 --- a/pkg/file/types.go +++ b/pkg/file/types.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/file/validate.go b/pkg/file/validate.go index ac2c325..867333d 100644 --- a/pkg/file/validate.go +++ b/pkg/file/validate.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/xeipuuv/gojsonschema" "sigs.k8s.io/yaml" ) diff --git a/pkg/file/writer.go b/pkg/file/writer.go index d33632d..e60d64c 100644 --- a/pkg/file/writer.go +++ b/pkg/file/writer.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" "sigs.k8s.io/yaml" ) diff --git a/pkg/file/writer_test.go b/pkg/file/writer_test.go index fea1cb0..5fed7a1 100644 --- a/pkg/file/writer_test.go +++ b/pkg/file/writer_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" ) diff --git a/pkg/scripts/update-deepcopy-gen.sh b/pkg/scripts/update-deepcopy-gen.sh index a25d0c9..abf2bdf 100755 --- a/pkg/scripts/update-deepcopy-gen.sh +++ b/pkg/scripts/update-deepcopy-gen.sh @@ -5,19 +5,19 @@ TMP_DIR=$(mktemp -d) trap "rm -rf $TMP_DIR" EXIT # konnect package -deepcopy-gen --input-dirs github.com/kong/deck/konnect \ +deepcopy-gen --input-dirs github.com/kong/go-database-reconciler/pkg/konnect \ -O zz_generated.deepcopy \ --go-header-file scripts/header-template.go.tmpl \ --output-base $TMP_DIR -cp $TMP_DIR/github.com/kong/deck/konnect/zz_generated.deepcopy.go \ +cp $TMP_DIR/github.com/kong/go-database-reconciler/pkg/konnect/zz_generated.deepcopy.go \ konnect/zz_generated.deepcopy.go # file package -deepcopy-gen --input-dirs github.com/kong/deck/file \ +deepcopy-gen --input-dirs github.com/kong/go-database-reconciler/pkg/file \ -O zz_generated.deepcopy \ --go-header-file scripts/header-template.go.tmpl \ --output-base $TMP_DIR -cp $TMP_DIR/github.com/kong/deck/file/zz_generated.deepcopy.go \ +cp $TMP_DIR/github.com/kong/go-database-reconciler/pkg/file/zz_generated.deepcopy.go \ file/zz_generated.deepcopy.go diff --git a/pkg/scripts/verify-deepcopy-gen.sh b/pkg/scripts/verify-deepcopy-gen.sh index ce911ed..e61d798 100755 --- a/pkg/scripts/verify-deepcopy-gen.sh +++ b/pkg/scripts/verify-deepcopy-gen.sh @@ -5,19 +5,19 @@ TMP_DIR=$(mktemp -d) trap "rm -rf $TMP_DIR" EXIT # konnect package -deepcopy-gen --input-dirs github.com/kong/deck/konnect \ +deepcopy-gen --input-dirs github.com/kong/go-database-reconciler/pkg/konnect \ -O zz_generated.deepcopy \ --go-header-file scripts/header-template.go.tmpl \ --output-base $TMP_DIR diff -Naur konnect/zz_generated.deepcopy.go \ - $TMP_DIR/github.com/kong/deck/konnect/zz_generated.deepcopy.go + $TMP_DIR/github.com/kong/go-database-reconciler/pkg/konnect/zz_generated.deepcopy.go # file package -deepcopy-gen --input-dirs github.com/kong/deck/file \ +deepcopy-gen --input-dirs github.com/kong/go-database-reconciler/pkg/file \ -O zz_generated.deepcopy \ --go-header-file scripts/header-template.go.tmpl \ --output-base $TMP_DIR diff -Naur file/zz_generated.deepcopy.go \ - $TMP_DIR/github.com/kong/deck/file/zz_generated.deepcopy.go + $TMP_DIR/github.com/kong/go-database-reconciler/pkg/file/zz_generated.deepcopy.go diff --git a/pkg/state/aclgroup.go b/pkg/state/aclgroup.go index c3531e5..b2d54c7 100644 --- a/pkg/state/aclgroup.go +++ b/pkg/state/aclgroup.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) var ( diff --git a/pkg/state/builder.go b/pkg/state/builder.go index 97526da..7e76515 100644 --- a/pkg/state/builder.go +++ b/pkg/state/builder.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/state/cacert.go b/pkg/state/cacert.go index a147864..0dc4de9 100644 --- a/pkg/state/cacert.go +++ b/pkg/state/cacert.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/certificate.go b/pkg/state/certificate.go index a2f472d..548e8a8 100644 --- a/pkg/state/certificate.go +++ b/pkg/state/certificate.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/consumer.go b/pkg/state/consumer.go index ac956cd..d7f4cfb 100644 --- a/pkg/state/consumer.go +++ b/pkg/state/consumer.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/consumer_group.go b/pkg/state/consumer_group.go index 7b1c6ff..6c9de07 100644 --- a/pkg/state/consumer_group.go +++ b/pkg/state/consumer_group.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/consumer_group_consumers.go b/pkg/state/consumer_group_consumers.go index c05adea..c4e53c1 100644 --- a/pkg/state/consumer_group_consumers.go +++ b/pkg/state/consumer_group_consumers.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/consumer_group_plugin.go b/pkg/state/consumer_group_plugin.go index f313219..cc290fb 100644 --- a/pkg/state/consumer_group_plugin.go +++ b/pkg/state/consumer_group_plugin.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/credentials.go b/pkg/state/credentials.go index ec5d534..4bdf472 100644 --- a/pkg/state/credentials.go +++ b/pkg/state/credentials.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" + "github.com/kong/go-database-reconciler/pkg/state/indexers" ) const ( diff --git a/pkg/state/document.go b/pkg/state/document.go index d5eb1c9..3e03d2d 100644 --- a/pkg/state/document.go +++ b/pkg/state/document.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/hashicorp/go-memdb" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/document_test.go b/pkg/state/document_test.go index 04ea0e8..5bd7ff2 100644 --- a/pkg/state/document_test.go +++ b/pkg/state/document_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/kong/deck/konnect" + "github.com/kong/go-database-reconciler/pkg/konnect" "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" ) diff --git a/pkg/state/konnect_types.go b/pkg/state/konnect_types.go index 85bd7e1..ea0e22b 100644 --- a/pkg/state/konnect_types.go +++ b/pkg/state/konnect_types.go @@ -3,7 +3,7 @@ package state import ( "reflect" - "github.com/kong/deck/konnect" + "github.com/kong/go-database-reconciler/pkg/konnect" ) // Document represents a document in Konnect. diff --git a/pkg/state/plugin.go b/pkg/state/plugin.go index 0b39519..777962d 100644 --- a/pkg/state/plugin.go +++ b/pkg/state/plugin.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) var errPluginNameRequired = fmt.Errorf("name of plugin required") diff --git a/pkg/state/rbac_endpoint_permission.go b/pkg/state/rbac_endpoint_permission.go index 87da91e..e21dce5 100644 --- a/pkg/state/rbac_endpoint_permission.go +++ b/pkg/state/rbac_endpoint_permission.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/rbac_role.go b/pkg/state/rbac_role.go index bd6f31d..17f5d0a 100644 --- a/pkg/state/rbac_role.go +++ b/pkg/state/rbac_role.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/route.go b/pkg/state/route.go index dfd3f22..0c9b389 100644 --- a/pkg/state/route.go +++ b/pkg/state/route.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/service.go b/pkg/state/service.go index 5b6d05a..232060f 100644 --- a/pkg/state/service.go +++ b/pkg/state/service.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/service_package.go b/pkg/state/service_package.go index c10dcfd..9426b40 100644 --- a/pkg/state/service_package.go +++ b/pkg/state/service_package.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/service_package_test.go b/pkg/state/service_package_test.go index 431f79b..e89c771 100644 --- a/pkg/state/service_package_test.go +++ b/pkg/state/service_package_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/kong/deck/konnect" + "github.com/kong/go-database-reconciler/pkg/konnect" "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" ) diff --git a/pkg/state/service_version.go b/pkg/state/service_version.go index af0b981..ae75a59 100644 --- a/pkg/state/service_version.go +++ b/pkg/state/service_version.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/service_version_test.go b/pkg/state/service_version_test.go index 8e93506..cfc939a 100644 --- a/pkg/state/service_version_test.go +++ b/pkg/state/service_version_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/kong/deck/konnect" + "github.com/kong/go-database-reconciler/pkg/konnect" "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" ) diff --git a/pkg/state/sni.go b/pkg/state/sni.go index 280dae9..4fd149e 100644 --- a/pkg/state/sni.go +++ b/pkg/state/sni.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/target.go b/pkg/state/target.go index b75f801..1c498bd 100644 --- a/pkg/state/target.go +++ b/pkg/state/target.go @@ -5,8 +5,8 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/state/indexers" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/state/indexers" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/upstream.go b/pkg/state/upstream.go index f228841..d78c177 100644 --- a/pkg/state/upstream.go +++ b/pkg/state/upstream.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/state/vault.go b/pkg/state/vault.go index b0c1fa4..b5c42df 100644 --- a/pkg/state/vault.go +++ b/pkg/state/vault.go @@ -5,7 +5,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/utils" ) const ( diff --git a/pkg/types/aclgroup.go b/pkg/types/aclgroup.go index 2b5c201..87f1b71 100644 --- a/pkg/types/aclgroup.go +++ b/pkg/types/aclgroup.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/basicauth.go b/pkg/types/basicauth.go index fbdaea2..14647a3 100644 --- a/pkg/types/basicauth.go +++ b/pkg/types/basicauth.go @@ -6,10 +6,10 @@ import ( "fmt" "sync" - "github.com/kong/deck/cprint" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/cprint" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/ca_cert.go b/pkg/types/ca_cert.go index 62f09cd..2f4fbc7 100644 --- a/pkg/types/ca_cert.go +++ b/pkg/types/ca_cert.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/certificate.go b/pkg/types/certificate.go index 8381168..463b9be 100644 --- a/pkg/types/certificate.go +++ b/pkg/types/certificate.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/consumer.go b/pkg/types/consumer.go index 4d5b52c..dea23fa 100644 --- a/pkg/types/consumer.go +++ b/pkg/types/consumer.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/consumer_group.go b/pkg/types/consumer_group.go index 772a454..794a32d 100644 --- a/pkg/types/consumer_group.go +++ b/pkg/types/consumer_group.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/consumer_group_consumer.go b/pkg/types/consumer_group_consumer.go index 6daee66..e19e72f 100644 --- a/pkg/types/consumer_group_consumer.go +++ b/pkg/types/consumer_group_consumer.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/consumer_group_plugin.go b/pkg/types/consumer_group_plugin.go index 4d37c47..b8f3728 100644 --- a/pkg/types/consumer_group_plugin.go +++ b/pkg/types/consumer_group_plugin.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/core.go b/pkg/types/core.go index 9d27a22..5c6d661 100644 --- a/pkg/types/core.go +++ b/pkg/types/core.go @@ -3,9 +3,9 @@ package types import ( "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/document.go b/pkg/types/document.go index 8e4e5d1..da76fe2 100644 --- a/pkg/types/document.go +++ b/pkg/types/document.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" ) // documentCRUD implements crud.Actions interface. diff --git a/pkg/types/hmacauth.go b/pkg/types/hmacauth.go index 553a550..e29a7fe 100644 --- a/pkg/types/hmacauth.go +++ b/pkg/types/hmacauth.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/jwtauth.go b/pkg/types/jwtauth.go index 8ceba6f..ea9e406 100644 --- a/pkg/types/jwtauth.go +++ b/pkg/types/jwtauth.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/keyauth.go b/pkg/types/keyauth.go index ad6ff00..72bf01a 100644 --- a/pkg/types/keyauth.go +++ b/pkg/types/keyauth.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/mtlsauth.go b/pkg/types/mtlsauth.go index 4e4f310..a8482bb 100644 --- a/pkg/types/mtlsauth.go +++ b/pkg/types/mtlsauth.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/oauth2.go b/pkg/types/oauth2.go index 9f447b8..e8b317d 100644 --- a/pkg/types/oauth2.go +++ b/pkg/types/oauth2.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" - "github.com/kong/deck/utils" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" + "github.com/kong/go-database-reconciler/pkg/utils" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/plugin.go b/pkg/types/plugin.go index fc3a595..8e3b140 100644 --- a/pkg/types/plugin.go +++ b/pkg/types/plugin.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/postProcess.go b/pkg/types/postProcess.go index 9b9b9c2..9d0bcf7 100644 --- a/pkg/types/postProcess.go +++ b/pkg/types/postProcess.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" ) type servicePostAction struct { diff --git a/pkg/types/rbac_endpoint_permission.go b/pkg/types/rbac_endpoint_permission.go index e72aff2..03f0225 100644 --- a/pkg/types/rbac_endpoint_permission.go +++ b/pkg/types/rbac_endpoint_permission.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/rbac_role.go b/pkg/types/rbac_role.go index dfede9a..6dc5f1b 100644 --- a/pkg/types/rbac_role.go +++ b/pkg/types/rbac_role.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/route.go b/pkg/types/route.go index e7ce4ad..003d149 100644 --- a/pkg/types/route.go +++ b/pkg/types/route.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/service.go b/pkg/types/service.go index a715152..6f27b07 100644 --- a/pkg/types/service.go +++ b/pkg/types/service.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/service_package.go b/pkg/types/service_package.go index c768d7f..f0a8c53 100644 --- a/pkg/types/service_package.go +++ b/pkg/types/service_package.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" ) // servicePackageCRUD implements crud.Actions interface. diff --git a/pkg/types/service_version.go b/pkg/types/service_version.go index b659013..174d434 100644 --- a/pkg/types/service_version.go +++ b/pkg/types/service_version.go @@ -6,9 +6,9 @@ import ( "fmt" "reflect" - "github.com/kong/deck/crud" - "github.com/kong/deck/konnect" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/konnect" + "github.com/kong/go-database-reconciler/pkg/state" ) // serviceVersionCRUD implements crud.Actions interface. diff --git a/pkg/types/sni.go b/pkg/types/sni.go index f5eb59a..eee6966 100644 --- a/pkg/types/sni.go +++ b/pkg/types/sni.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/target.go b/pkg/types/target.go index 28b7416..8d434cb 100644 --- a/pkg/types/target.go +++ b/pkg/types/target.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/upstream.go b/pkg/types/upstream.go index 2e888dd..c00de06 100644 --- a/pkg/types/upstream.go +++ b/pkg/types/upstream.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/types/vault.go b/pkg/types/vault.go index e742934..d276157 100644 --- a/pkg/types/vault.go +++ b/pkg/types/vault.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kong/deck/crud" - "github.com/kong/deck/state" + "github.com/kong/go-database-reconciler/pkg/crud" + "github.com/kong/go-database-reconciler/pkg/state" "github.com/kong/go-kong/kong" ) diff --git a/pkg/utils/defaulter.go b/pkg/utils/defaulter.go index d506014..89a3e2f 100644 --- a/pkg/utils/defaulter.go +++ b/pkg/utils/defaulter.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/imdario/mergo" + "dario.cat/mergo" "github.com/kong/go-kong/kong" ) diff --git a/pkg/utils/types.go b/pkg/utils/types.go index 3d4986e..8bd33c9 100644 --- a/pkg/utils/types.go +++ b/pkg/utils/types.go @@ -16,7 +16,7 @@ import ( "time" "github.com/hashicorp/go-retryablehttp" - "github.com/kong/deck/konnect" + "github.com/kong/go-database-reconciler/pkg/konnect" "github.com/kong/go-kong/kong" "github.com/kong/go-kong/kong/custom" "github.com/ssgelm/cookiejarparser" diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index f87d034..a9ac8d8 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/kong/deck/cprint" + "github.com/kong/go-database-reconciler/pkg/cprint" "github.com/kong/go-kong/kong" )