diff --git a/go.mod b/go.mod index 599e978..278ab08 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,12 @@ go 1.19 require ( github.com/go-chi/chi v1.5.5 - github.com/go-chi/chi/v5 v5.0.11 github.com/go-ping/ping v1.1.0 github.com/google/uuid v1.5.0 github.com/lithammer/fuzzysearch v1.1.8 github.com/onsi/ginkgo/v2 v2.14.0 github.com/onsi/gomega v1.30.0 - github.com/opiproject/opi-api v0.0.0-20231211154947-aee3998dd0c2 + github.com/opiproject/opi-api v0.0.0-20240118183513-e44db269fba4 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.8.4 go.einride.tech/aip v0.66.0 diff --git a/go.sum b/go.sum index da62447..e761345 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -9,10 +8,6 @@ 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/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE= github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw= -github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw= @@ -29,8 +24,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -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/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= @@ -43,43 +36,17 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4= github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= -github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= -github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs= -github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/opiproject/opi-api v0.0.0-20231028074849-2fd1b3a4ab9f h1:CCgubUpYT941qu60oEbAaYNn6E3HPGMcTOOOVI9U4sQ= -github.com/opiproject/opi-api v0.0.0-20231028074849-2fd1b3a4ab9f/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231030062733-bbe47cce6d77 h1:7XbMFmFH42T9QY2DjL8s5VVU25cdEdDznBDnmUm3YcE= -github.com/opiproject/opi-api v0.0.0-20231030062733-bbe47cce6d77/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231105064559-afce4254fa49 h1:IcZrm+pPJNO3uCpo9DjQ18iUfQumVwyz/cA6HKcMtws= -github.com/opiproject/opi-api v0.0.0-20231105064559-afce4254fa49/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231106063049-7979f3e83669 h1:KUPG9eDkL6loowjRSwcfP1PS0pJ2u1ikAw+JiQ7v77c= -github.com/opiproject/opi-api v0.0.0-20231106063049-7979f3e83669/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231113071405-8df008ba93b3 h1:xVv7oXmxKbhi00DNeC+3Pja2bUtSqBToLSEXT1Ld3hE= -github.com/opiproject/opi-api v0.0.0-20231113071405-8df008ba93b3/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231120071940-7b62be4a63bd h1:CCS0COZX9ZM4JAW90EW0EioF95d/kbPGB4rabXRxv1A= -github.com/opiproject/opi-api v0.0.0-20231120071940-7b62be4a63bd/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231127063346-b9b53584ef18 h1:6CYdU51sDuW+ab7QuB09r+9L7lHXEg8cKdsuCiD0N5s= -github.com/opiproject/opi-api v0.0.0-20231127063346-b9b53584ef18/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231204182835-b9900483c605 h1:3buAwkHHsEMjn+cIUOTi7RLcG8n3/52UNm8pZ8tZOJI= -github.com/opiproject/opi-api v0.0.0-20231204182835-b9900483c605/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= -github.com/opiproject/opi-api v0.0.0-20231211154947-aee3998dd0c2 h1:sWvDPuYS6Kbke3k5rpD46kHhGx//rBKMw3Z1/mDZxdk= -github.com/opiproject/opi-api v0.0.0-20231211154947-aee3998dd0c2/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= +github.com/opiproject/opi-api v0.0.0-20240118183513-e44db269fba4 h1:YBjvYWQQAbNIGsAXvB6FwL9Encr1nzo3/w+bB/tXltM= +github.com/opiproject/opi-api v0.0.0-20240118183513-e44db269fba4/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= 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/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -94,36 +61,23 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO 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/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.einride.tech/aip v0.63.0 h1:1u2ppyKS9hj++bp+q4rOEma7dAbG7ZPl6tSBLf8t+wo= -go.einride.tech/aip v0.63.0/go.mod h1:kK5nO4xh3JoniXp64dxgT474Egmr5L7SlsGD6xvP6fU= -go.einride.tech/aip v0.65.0 h1:aqKEV1g9diXcR6DAxBVZoJn6ho8SuC+TOZFXzuu7kLU= -go.einride.tech/aip v0.65.0/go.mod h1:wcRZ57XFEvERWLPy9VqDBtXc/ZFj7ugsd32F5o8Th+s= go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= 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= @@ -134,12 +88,6 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -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/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -150,16 +98,12 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= -golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -170,16 +114,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1: google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k= -google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/network/bridge_port.go b/network/bridge_port.go index dae9a80..7c21e6f 100644 --- a/network/bridge_port.go +++ b/network/bridge_port.go @@ -27,11 +27,11 @@ func (c evpnClientImpl) CreateBridgePort(ctx context.Context, name string, mac s client := c.getEvpnBridgePortClient(conn) switch bridgePortType { case "access": - typeOfPort = pb.BridgePortType_ACCESS + typeOfPort = pb.BridgePortType_BRIDGE_PORT_TYPE_ACCESS case "trunk": - typeOfPort = pb.BridgePortType_TRUNK + typeOfPort = pb.BridgePortType_BRIDGE_PORT_TYPE_TRUNK default: - typeOfPort = pb.BridgePortType_UNKNOWN + typeOfPort = pb.BridgePortType_BRIDGE_PORT_TYPE_UNSPECIFIED } data, err := client.CreateBridgePort(ctx, &pb.CreateBridgePortRequest{ BridgePortId: name, diff --git a/network/bridge_port_test.go b/network/bridge_port_test.go index bc18c9f..6498ff5 100644 --- a/network/bridge_port_test.go +++ b/network/bridge_port_test.go @@ -25,7 +25,7 @@ func TestCreateBridgePort(t *testing.T) { testBridgePort := &pb.BridgePort{ Spec: &pb.BridgePortSpec{ MacAddress: []byte("00:11:22:aa:bb:cc"), - Ptype: pb.BridgePortType_ACCESS, + Ptype: pb.BridgePortType_BRIDGE_PORT_TYPE_ACCESS, LogicalBridges: []string{"lb1", "lb2"}, }, } diff --git a/storage/frontend/nvme_controller.go b/storage/frontend/nvme_controller.go index 981be34..ccdf439 100644 --- a/storage/frontend/nvme_controller.go +++ b/storage/frontend/nvme_controller.go @@ -29,9 +29,9 @@ func (c *Client) CreateNvmeTCPController( var adrfam pb.NvmeAddressFamily switch { case ip.To4() != nil: - adrfam = pb.NvmeAddressFamily_NVME_ADRFAM_IPV4 + adrfam = pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4 case ip.To16() != nil: - adrfam = pb.NvmeAddressFamily_NVME_ADRFAM_IPV6 + adrfam = pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV6 default: return nil, fmt.Errorf("invalid ip address format: %v", ip) } @@ -44,7 +44,7 @@ func (c *Client) CreateNvmeTCPController( NvmeControllerId: id, NvmeController: &pb.NvmeController{ Spec: &pb.NvmeControllerSpec{ - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, Endpoint: &pb.NvmeControllerSpec_FabricsId{ FabricsId: &pb.FabricsEndpoint{ Traddr: ip.String(), @@ -79,7 +79,7 @@ func (c *Client) CreateNvmePcieController( NvmeControllerId: id, NvmeController: &pb.NvmeController{ Spec: &pb.NvmeControllerSpec{ - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_PCIE, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE, Endpoint: &pb.NvmeControllerSpec_PcieId{ PcieId: &pb.PciEndpoint{ PortId: wrapperspb.Int32(int32(port)), diff --git a/storage/frontend/nvme_controller_test.go b/storage/frontend/nvme_controller_test.go index 111ebb2..61221dd 100644 --- a/storage/frontend/nvme_controller_test.go +++ b/storage/frontend/nvme_controller_test.go @@ -27,24 +27,24 @@ func TestCreateNvmeTCPController(t *testing.T) { ipV6Addr := net.ParseIP("::") testIPV4Controller := &pb.NvmeController{ Spec: &pb.NvmeControllerSpec{ - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, Endpoint: &pb.NvmeControllerSpec_FabricsId{ FabricsId: &pb.FabricsEndpoint{ Traddr: ipV4Addr.String(), Trsvcid: "4420", - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4, }, }, }, } testIPV6Controller := &pb.NvmeController{ Spec: &pb.NvmeControllerSpec{ - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, Endpoint: &pb.NvmeControllerSpec_FabricsId{ FabricsId: &pb.FabricsEndpoint{ Traddr: ipV6Addr.String(), Trsvcid: "4420", - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV6, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV6, }, }, }, @@ -166,7 +166,7 @@ func TestCreateNvmePcieController(t *testing.T) { subsystemName := "subsysPcie0Name" testPcieController := &pb.NvmeController{ Spec: &pb.NvmeControllerSpec{ - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_PCIE, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE, Endpoint: &pb.NvmeControllerSpec_PcieId{ PcieId: &pb.PciEndpoint{ PortId: wrapperspb.Int32(0), diff --git a/storage/goopicsi.go b/storage/goopicsi.go index e4b42bf..851bcba 100644 --- a/storage/goopicsi.go +++ b/storage/goopicsi.go @@ -69,12 +69,12 @@ func NvmeControllerConnect(id string, trAddr string, subnqn string, trSvcID int6 NvmePathId: nvmeControllerToPathResourceID(id), NvmePath: &pb.NvmePath{ Traddr: trAddr, - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, Fabrics: &pb.FabricsPath{ Subnqn: subnqn, Trsvcid: trSvcID, Hostnqn: hostnqn, - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4, }, }, }) @@ -268,7 +268,7 @@ func CreateNvmeNamespace(id string, subSystemID string, nguid string, hostID int defer cancel() client1 := pb.NewNullVolumeServiceClient(conn) - response, err := client1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{Parent: "todo"}) + response, err := client1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{}) if err != nil { log.Println(err) @@ -278,7 +278,7 @@ func CreateNvmeNamespace(id string, subSystemID string, nguid string, hostID int volumeData := response.NullVolumes volumeID := "" for _, data := range volumeData { - uuid := strings.ReplaceAll(data.Uuid.Value, "-", "") + uuid := strings.ReplaceAll(data.Uuid, "-", "") if uuid == nguid { volumeID = data.Name } diff --git a/storage/test/backend.go b/storage/test/backend.go index 8a512ad..c31531b 100644 --- a/storage/test/backend.go +++ b/storage/test/backend.go @@ -153,10 +153,10 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien Parent: rr0.Name, NvmePathId: resourceID, NvmePath: &pb.NvmePath{ - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, Traddr: addr[0].String(), Fabrics: &pb.FabricsPath{ - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4, Trsvcid: int64(port), Subnqn: "nqn.2016-06.io.spdk:cnode1", Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c", @@ -184,10 +184,10 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"*"}}, NvmePath: &pb.NvmePath{ Name: np0.Name, - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, Traddr: addr[0].String(), Fabrics: &pb.FabricsPath{ - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4, Trsvcid: int64(port), Subnqn: "nqn.2016-06.io.spdk:cnode1", Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c", @@ -272,7 +272,7 @@ func executeNullVolume(ctx context.Context, c1 pb.NullVolumeServiceClient) error return err } log.Printf("Updated Null: %v", rs3) - rs4, err := c1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{Parent: "todo"}) + rs4, err := c1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{}) if err != nil { return err } @@ -331,7 +331,7 @@ func executeAioVolume(ctx context.Context, c2 pb.AioVolumeServiceClient) error { return err } log.Printf("Updated Aio: %v", ra3) - ra4, err := c2.ListAioVolumes(ctx, &pb.ListAioVolumesRequest{Parent: "todo"}) + ra4, err := c2.ListAioVolumes(ctx, &pb.ListAioVolumesRequest{}) if err != nil { return err } diff --git a/storage/test/frontend.go b/storage/test/frontend.go index b3e43f3..6c262b9 100644 --- a/storage/test/frontend.go +++ b/storage/test/frontend.go @@ -13,7 +13,6 @@ import ( "time" "github.com/google/uuid" - pbc "github.com/opiproject/opi-api/common/v1/gen/go" pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go" "google.golang.org/protobuf/proto" @@ -266,7 +265,7 @@ func executeVirtioBlk(ctx context.Context, c4 pb.FrontendVirtioBlkServiceClient) log.Printf("could not update VirtioBlk: %v", err) } log.Printf("Updated VirtioBlk: %v", rv3) - rv4, err := c4.ListVirtioBlks(ctx, &pb.ListVirtioBlksRequest{Parent: "todo"}) + rv4, err := c4.ListVirtioBlks(ctx, &pb.ListVirtioBlksRequest{}) if err != nil { return err } @@ -325,10 +324,10 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient) FabricsId: &pb.FabricsEndpoint{ Traddr: "127.0.0.1", Trsvcid: "4421", - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4, }, }, - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, MaxNsq: 5, MaxNcq: 6, Sqes: 7, @@ -356,7 +355,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient) NvmeNamespace: &pb.NvmeNamespace{ Spec: &pb.NvmeNamespaceSpec{ VolumeNameRef: "Malloc1", - Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"}, + Uuid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb", Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb", Eui64: 1967554867335598546, HostNsid: 1}}}) @@ -383,7 +382,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient) Name: rn1.Name, Spec: &pb.NvmeNamespaceSpec{ VolumeNameRef: "Malloc1", - Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"}, + Uuid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb", Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb", Eui64: 1967554867335598546, HostNsid: 1}}}) @@ -465,10 +464,10 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient) FabricsId: &pb.FabricsEndpoint{ Traddr: "127.0.0.1", Trsvcid: "4421", - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4, }, }, - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, MaxNsq: 5, MaxNcq: 6, Sqes: 7, @@ -500,10 +499,10 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient) FabricsId: &pb.FabricsEndpoint{ Traddr: "127.0.0.1", Trsvcid: "4421", - Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4, + Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4, }, }, - Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP, + Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP, MaxNsq: 8, MaxNcq: 7, Sqes: 6, diff --git a/testing/mock-server/server/server.go b/testing/mock-server/server/server.go index 8c35b53..cf62d88 100644 --- a/testing/mock-server/server/server.go +++ b/testing/mock-server/server/server.go @@ -21,7 +21,15 @@ import ( ) // GoopCSI mock gRPC server to implement mock service calls -type GoopCSI struct{} +type GoopCSI struct { + pb.UnimplementedNullVolumeServiceServer + pb.UnimplementedNvmeRemoteControllerServiceServer + pb.UnimplementedFrontendNvmeServiceServer +} + +var _ pb.NullVolumeServiceServer = &GoopCSI{} +var _ pb.NvmeRemoteControllerServiceServer = &GoopCSI{} +var _ pb.FrontendNvmeServiceServer = &GoopCSI{} // CreateNullVolume creates a mock NullVolume func (s *GoopCSI) CreateNullVolume(_ context2.Context, _ *pb.CreateNullVolumeRequest) (*pb.NullVolume, error) {