From e3a4a0595a8e2c183d4f7b517ee6093f29179981 Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Sat, 10 Oct 2026 16:42:23 +0200 Subject: [PATCH] Migrate to connect-go v2 --- go.mod | 25 +++--- go.sum | 58 +++++++------- testing/e2e/test_cmd.go | 6 +- tests/e2e/admin/audit_test.go | 14 ++-- tests/e2e/admin/component_test.go | 32 ++++---- tests/e2e/admin/image_test.go | 38 +++++----- tests/e2e/admin/ip_test.go | 14 ++-- tests/e2e/admin/machine_test.go | 88 +++++++++++----------- tests/e2e/admin/network_test.go | 50 ++++++------ tests/e2e/admin/partition_test.go | 26 +++---- tests/e2e/admin/project_test.go | 8 +- tests/e2e/admin/size_test.go | 26 +++---- tests/e2e/admin/switch_test.go | 56 +++++++------- tests/e2e/admin/task_test.go | 32 ++++---- tests/e2e/admin/tenant_test.go | 14 ++-- tests/e2e/admin/token_test.go | 12 +-- tests/e2e/admin/vpn_test.go | 14 ++-- tests/e2e/api/audit_test.go | 26 +++---- tests/e2e/api/health_test.go | 8 +- tests/e2e/api/image_test.go | 20 ++--- tests/e2e/api/ip_test.go | 72 +++++++++--------- tests/e2e/api/machine_test.go | 66 ++++++++-------- tests/e2e/api/network_test.go | 66 ++++++++-------- tests/e2e/api/project_test.go | 121 +++++++++++++++--------------- tests/e2e/api/size_test.go | 14 ++-- tests/e2e/api/tenant_test.go | 121 +++++++++++++++--------------- tests/e2e/api/token_test.go | 49 ++++++------ tests/e2e/api/user_test.go | 8 +- tests/e2e/api/version_test.go | 8 +- 29 files changed, 546 insertions(+), 546 deletions(-) diff --git a/go.mod b/go.mod index cf0dfe8..3a00134 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,13 @@ module github.com/metal-stack/cli go 1.27 require ( - connectrpc.com/connect v1.20.0 - connectrpc.com/validate v0.6.0 - github.com/dustin/go-humanize v1.0.1 + connectrpc.com/connect/v2 v2.0.0 + connectrpc.com/validate v0.9.0 + github.com/dustin/go-humanize v1.1.0 github.com/fatih/color v1.19.0 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/metal-stack/api v0.8.0 + github.com/metal-stack/api v0.8.1-0.20261010132134-d46069467da4 github.com/metal-stack/metal-console v0.8.2 github.com/metal-stack/metal-lib v0.26.3 github.com/metal-stack/v v1.0.3 @@ -17,7 +17,7 @@ require ( github.com/spf13/cobra v1.10.2 github.com/spf13/viper v1.21.0 github.com/stretchr/testify v1.12.1 - google.golang.org/grpc v1.83.2 + google.golang.org/grpc v1.84.0 google.golang.org/protobuf v1.36.12 sigs.k8s.io/yaml v1.6.0 ) @@ -28,6 +28,7 @@ require ( buf.build/go/protoyaml v0.7.0 // indirect cel.dev/cel-go v0.32.0 // indirect cel.dev/expr v0.25.3 // indirect + connectrpc.com/connect v1.21.0 // indirect filippo.io/edwards25519 v1.2.0 // indirect github.com/akutz/memconn v0.1.0 // indirect github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e // indirect @@ -59,13 +60,11 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jsimonetti/rtnetlink v1.4.2 // indirect github.com/klauspost/compress v1.20.0 // indirect - github.com/klauspost/connect-compress/v2 v2.1.1 // indirect github.com/mattn/go-colorable v0.1.15 // indirect github.com/mattn/go-isatty v0.0.24 // indirect github.com/mattn/go-runewidth v0.0.28 // indirect github.com/mdlayher/netlink v1.11.2 // indirect github.com/mdlayher/socket v0.6.1 // indirect - github.com/minio/minlz v1.2.0 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect @@ -93,18 +92,18 @@ require ( go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect go4.org/netipx v0.0.0-20260823151212-3075585bcbeb // indirect golang.org/x/crypto v0.56.0 // indirect - golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa // indirect + golang.org/x/exp v0.0.0-20261009195045-ca0d7ba23607 // indirect golang.org/x/net v0.58.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sync v0.22.0 // indirect - golang.org/x/sys v0.47.0 // indirect + golang.org/x/sync v0.24.0 // indirect + golang.org/x/sys v0.49.0 // indirect golang.org/x/term v0.45.0 // indirect - golang.org/x/text v0.41.0 // indirect + golang.org/x/text v0.43.0 // indirect golang.org/x/time v0.15.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect golang.zx2c4.com/wireguard/windows v1.0.1 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260831171406-18b4a7587f8a // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20261005182115-fad411399dd8 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20261005182115-fad411399dd8 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gvisor.dev/gvisor v0.0.0-20260224225140-573d5e7127a8 // indirect diff --git a/go.sum b/go.sum index 2aa4f99..ddfea97 100644 --- a/go.sum +++ b/go.sum @@ -10,10 +10,12 @@ cel.dev/cel-go v0.32.0 h1:irvpFKr5EuGPyxeME03ERh0rii1TX+BDAnB9eL3IvNk= cel.dev/cel-go v0.32.0/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU= cel.dev/expr v0.25.3 h1:A2jO8jwOugrrovveCWfj0KEZOfqiLgAcwjpHPhzIGw0= cel.dev/expr v0.25.3/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= -connectrpc.com/connect v1.20.0 h1:6TNDAB+WeNd2uolWNlYczB5E0KNNaVMNUEx8JEUsPmQ= -connectrpc.com/connect v1.20.0/go.mod h1:A2ygJrukXwWy32vkCAAHNVguZrqZ+jeZ9rGRnGR4dN4= -connectrpc.com/validate v0.6.0 h1:DcrgDKt2ZScrUs/d/mh9itD2yeEa0UbBBa+i0mwzx+4= -connectrpc.com/validate v0.6.0/go.mod h1:ihrpI+8gVbLH1fvVWJL1I3j0CfWnF8P/90LsmluRiZs= +connectrpc.com/connect v1.21.0 h1:LhqSJt7jHf5NJBo9Jq/t/9FjcYAideif0mg+qe2jCUs= +connectrpc.com/connect v1.21.0/go.mod h1:A2ygJrukXwWy32vkCAAHNVguZrqZ+jeZ9rGRnGR4dN4= +connectrpc.com/connect/v2 v2.0.0 h1:PVVpWl2Xv9dIWN2gijs4HK40NSnPFzLqCEEmZ8fCUQ8= +connectrpc.com/connect/v2 v2.0.0/go.mod h1:N32OLrstcPUzkykFynnefFro3+xzSdOrZlK2jHmS/xo= +connectrpc.com/validate v0.9.0 h1:NLl+dbx87CZh1LId4FF87t92L5tsdmS0qDXxjZRe054= +connectrpc.com/validate v0.9.0/go.mod h1:dBEUzscHj4InQpm6J5xF8zX51MIUAPWZ7Jq8aNXRY9Y= filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= filippo.io/mkcert v1.4.4 h1:8eVbbwfVlaqUM7OwuftKc2nuYOoTDQWqsoXmzoXZdbc= @@ -95,8 +97,8 @@ github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e h1:vUmf0yez github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e/go.mod h1:YTIHhz/QFSYnu/EhlF2SpU2Uk+32abacUYA5ZPljz1A= github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c= github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/dustin/go-humanize v1.1.0 h1:dbKTrvD0klcbBV/h4AWJdMuZogJACoMlvWIWZ5b2xWg= +github.com/dustin/go-humanize v1.1.0/go.mod h1:hc1CvRkJMsgxqjmjMQF3QNRAZBwY8AXBAzKYoSX9sFI= github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w= github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= @@ -167,8 +169,6 @@ github.com/jsimonetti/rtnetlink v1.4.2 h1:Df9w9TZ3npHTyDn0Ev9e1uzmN2odmXd0QX+J5G github.com/jsimonetti/rtnetlink v1.4.2/go.mod h1:92s6LJdE+1iOrw+F2/RO7LYI2Qd8pPpFNNUYW06gcoM= github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA= github.com/klauspost/compress v1.20.0/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI= -github.com/klauspost/connect-compress/v2 v2.1.1 h1:ycZNp4rWOZBodVE2Ls5AzK4aHkyK+GteEfzRZgKNs+c= -github.com/klauspost/connect-compress/v2 v2.1.1/go.mod h1:9oilsPHJMzGKkjafSBk9J7iVo4mO+dw0G0KSdVpnlVE= github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a h1:+RR6SqnTkDLWyICxS1xpjCi/3dhyV+TgZwA6Ww3KncQ= github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a/go.mod h1:YTtCCM3ryyfiu4F7t8HQ1mxvp1UBdWM2r6Xa+nGWvDk= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= @@ -191,8 +191,8 @@ github.com/mdlayher/sdnotify v1.0.0 h1:Ma9XeLVN/l0qpyx1tNeMSeTjCPH6NtuD6/N9XdTlQ github.com/mdlayher/sdnotify v1.0.0/go.mod h1:HQUmpM4XgYkhDLtd+Uad8ZFK1T9D5+pNxnXQjCeJlGE= github.com/mdlayher/socket v0.6.1 h1:M7uj2NtuujUY4mYr1C57NmfNiRHbkKpnBxO856lsc3A= github.com/mdlayher/socket v0.6.1/go.mod h1:+/SGtqc9V+5dAuRgQsU0fGBI+oRDiW7O2Obx10OIWfg= -github.com/metal-stack/api v0.8.0 h1:olAQtHx7uv3f/jaKKo7aVILhZgO5McQTLeKfS0FkolM= -github.com/metal-stack/api v0.8.0/go.mod h1:rWdj0dTAg2w/WuQhIZ+JVp9b68v6VVCm1k7sLx4U+PQ= +github.com/metal-stack/api v0.8.1-0.20261010132134-d46069467da4 h1:L+EBjZYWvW7I/hvmQ+GU1JwUTmqkCum2P2lpHfvI5Wo= +github.com/metal-stack/api v0.8.1-0.20261010132134-d46069467da4/go.mod h1:y94d1jVWCT7TSujDXwLOy8iIrcGy/1ikbpvrUZOuZso= github.com/metal-stack/metal-console v0.8.2 h1:Y86penzEROJKcLica1PeE2ddtr9G0/u16HiCAYXaxxU= github.com/metal-stack/metal-console v0.8.2/go.mod h1:ZkselOaxF/iELFL9Tku3maXgpX4DM0CHjoG7CGuky6E= github.com/metal-stack/metal-lib v0.26.3 h1:K5gLoD65m6p3l6qCPrfavIdvNdWfmF2QdXrvU2URaZs= @@ -201,8 +201,6 @@ github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs= github.com/metal-stack/v v1.0.3/go.mod h1:YTahEu7/ishwpYKnp/VaW/7nf8+PInogkfGwLcGPdXg= github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= -github.com/minio/minlz v1.2.0 h1:6IOBuiHg04QxvbFfgFLT/9sMaO/UhL7S+ApW1mK8q5A= -github.com/minio/minlz v1.2.0/go.mod h1:Ls9H7nlkASeCcdl5thjVD5Eraj6z+zGa7xtq57jIKD4= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= @@ -304,43 +302,43 @@ go4.org/netipx v0.0.0-20260823151212-3075585bcbeb h1:XBM4hvfwGAttkkiTIFfeigdfcL1 go4.org/netipx v0.0.0-20260823151212-3075585bcbeb/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/crypto v0.56.0 h1:GUh5Ii4J5jtcseSMiRqr1jXCNHoxjeV9Fmekc2oLy6Y= golang.org/x/crypto v0.56.0/go.mod h1:OMW5y6CY9l38uPLmxU6l6pwcXp1obtLo3e6gT7gQR2I= -golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa h1:QSyA8ishJCyT21kER9KwNt0b7BM3iRK4x9QXhjN5Fdk= -golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa/go.mod h1:zeBbvyFKDaLwa7CH/zI8KXt7gTl14SF7sO08Pl5jBCM= +golang.org/x/exp v0.0.0-20261009195045-ca0d7ba23607 h1:o259es6R0mYtmCeID0xv+dkp5kQSf6qp8zs0j4MdUaI= +golang.org/x/exp v0.0.0-20261009195045-ca0d7ba23607/go.mod h1:SRjTzy5WcYqRRqquLUvHeeovSwLO0CZ3xcltZNO4Fck= golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f h1:phY1HzDcf18Aq9A8KkmRtY9WvOFIxN8wgfvy6Zm1DV8= golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo= golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA= -golang.org/x/mod v0.39.0 h1:UF5zwQdCRRUpHfyPwr7d4UrGiVeldIsogtzWVnczL74= -golang.org/x/mod v0.39.0/go.mod h1:bvIbwjQ0HUFFf5AKukeeYQG4ZBUG9yxQbR9aEweIwYY= +golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= -golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= -golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= -golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= -golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= +golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= +golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= -golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= -golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= +golang.org/x/tools v0.51.0 h1:k4Xc/1Om9jwkBJBo4NVLMSARBoWtK10mx+W5BnXCeAI= +golang.org/x/tools v0.51.0/go.mod h1:9eEncMayCV6zRMGhR5eZEC2iBx98qWcF1HZ9Z7wJOoA= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446 h1:cqHQ3AycTHvM2R7ikgyX57D+XvtcSnGylsLkOVhta/w= golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw= golang.zx2c4.com/wireguard/windows v1.0.1 h1:eOxiDVbywPC+ZQqvdCK7x+ZwWXKbYv50TtH8ysFIbw8= golang.zx2c4.com/wireguard/windows v1.0.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs= -google.golang.org/genproto/googleapis/api v0.0.0-20260831171406-18b4a7587f8a h1:i3TAXhpKc7TUP1VAPiBBrv45kamjoizCC3rOC0cAbOs= -google.golang.org/genproto/googleapis/api v0.0.0-20260831171406-18b4a7587f8a/go.mod h1:CvYJHpbzPlT0fb/PsgtAamdwru/GVxUsomFdXTpOTI8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a h1:3Dnd1cDaZlB68lziofO+bJXpjOy8UfRv8Unt+yH8tQ4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= -google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU= -google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8= +google.golang.org/genproto/googleapis/api v0.0.0-20261005182115-fad411399dd8 h1:cFbkNigDInw+wVTXc+CyhUsoHGJCw0BR6mlNoRVfre0= +google.golang.org/genproto/googleapis/api v0.0.0-20261005182115-fad411399dd8/go.mod h1:QK6p7IgD7IZEZJBhhSUCib5X2vMOzlrGCGUw2XyVDh0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261005182115-fad411399dd8 h1:0SXBqli5dnuCKMjI/X3FM226zEaEa0GUcSCJtN1vL2o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261005182115-fad411399dd8/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= +google.golang.org/grpc v1.84.0 h1:soMyaPJ8pAak5PIQ0DGBUir0XRo2fRoMqhNWMLlLxO0= +google.golang.org/grpc v1.84.0/go.mod h1:ljCht0DrxQrXBDRTZp52Qxh3Ffk8CdYm2sj4O2QN2C0= google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc= google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/testing/e2e/test_cmd.go b/testing/e2e/test_cmd.go index 9843115..ba46d58 100644 --- a/testing/e2e/test_cmd.go +++ b/testing/e2e/test_cmd.go @@ -6,7 +6,7 @@ import ( "log/slog" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "connectrpc.com/validate" client "github.com/metal-stack/api/go/client" "github.com/metal-stack/cli/cmd" @@ -27,9 +27,9 @@ type TestConfig struct { func NewRootCmd(t *testing.T, c *TestConfig) e2e_test.NewRootCmdFunc { return func() (*cobra.Command, *bytes.Buffer) { - interceptors := []connect.Interceptor{ + interceptors := []connect.ClientInterceptor{ client.NewTestInterceptor(t, c.ClientCalls), - validate.NewInterceptor(), + validate.NewClientInterceptor(), } cl, err := client.New(&client.DialConfig{ diff --git a/tests/e2e/admin/audit_test.go b/tests/e2e/admin/audit_test.go index 066b966..c561b7a 100644 --- a/tests/e2e/admin/audit_test.go +++ b/tests/e2e/admin/audit_test.go @@ -3,13 +3,13 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_AdminAuditCmd_List(t *testing.T) { @@ -23,14 +23,14 @@ func Test_AdminAuditCmd_List(t *testing.T) { WantRequest: &adminv2.AuditServiceListRequest{ Query: &apiv2.AuditQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.AuditServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.AuditServiceListResponse{ Traces: []*apiv2.AuditTrace{ testresources.Trace1(), testresources.Trace2(), testresources.Trace3(), }, - }) + } }, }, }, @@ -77,10 +77,10 @@ func Test_AuditCmd_Describe(t *testing.T) { WantRequest: &adminv2.AuditServiceGetRequest{ Uuid: testresources.Trace1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.AuditServiceGetResponse{ + WantResponse: func() proto.Message { + return &adminv2.AuditServiceGetResponse{ Trace: testresources.Trace1(), - }) + } }, }, }, diff --git a/tests/e2e/admin/component_test.go b/tests/e2e/admin/component_test.go index 76d90f0..310aee3 100644 --- a/tests/e2e/admin/component_test.go +++ b/tests/e2e/admin/component_test.go @@ -3,13 +3,13 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_AdminComponentCmd_Describe(t *testing.T) { @@ -23,10 +23,10 @@ func Test_AdminComponentCmd_Describe(t *testing.T) { WantRequest: &adminv2.ComponentServiceGetRequest{ Uuid: testresources.Component1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ComponentServiceGetResponse{ + WantResponse: func() proto.Message { + return &adminv2.ComponentServiceGetResponse{ Component: testresources.Component1(), - }) + } }, }, }, @@ -67,13 +67,13 @@ func Test_AdminComponentCmd_List(t *testing.T) { WantRequest: &adminv2.ComponentServiceListRequest{ Query: &apiv2.ComponentQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ComponentServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.ComponentServiceListResponse{ Components: []*apiv2.Component{ testresources.Component1(), testresources.Component2(), }, - }) + } }, }, }, @@ -117,24 +117,24 @@ func Test_AdminComponentCmd_Prune(t *testing.T) { WantRequest: &adminv2.ComponentServiceListRequest{ Query: &apiv2.ComponentQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ComponentServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.ComponentServiceListResponse{ Components: []*apiv2.Component{ testresources.Component1(), testresources.Component2(), testresources.Component3(), }, - }) + } }, }, { WantRequest: &adminv2.ComponentServiceDeleteRequest{ Uuid: testresources.Component3().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ComponentServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.ComponentServiceDeleteResponse{ Component: testresources.Component3(), - }) + } }, }, }, @@ -174,10 +174,10 @@ func Test_AdminComponentCmd_Delete(t *testing.T) { WantRequest: &adminv2.ComponentServiceDeleteRequest{ Uuid: testresources.Component1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ComponentServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.ComponentServiceDeleteResponse{ Component: testresources.Component1(), - }) + } }, }, }, diff --git a/tests/e2e/admin/image_test.go b/tests/e2e/admin/image_test.go index f8e7a0f..d40d250 100644 --- a/tests/e2e/admin/image_test.go +++ b/tests/e2e/admin/image_test.go @@ -3,7 +3,6 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -12,6 +11,7 @@ import ( e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_AdminImageCmd_Delete(t *testing.T) { @@ -25,10 +25,10 @@ func Test_AdminImageCmd_Delete(t *testing.T) { WantRequest: &adminv2.ImageServiceDeleteRequest{ Id: testresources.Image1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ImageServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.ImageServiceDeleteResponse{ Image: testresources.Image1(), - }) + } }, }, }, @@ -75,10 +75,10 @@ func Test_AdminImageCmd_Create(t *testing.T) { WantRequest: &adminv2.ImageServiceCreateRequest{ Image: testresources.Image1(), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ImageServiceCreateResponse{ + WantResponse: func() proto.Message { + return &adminv2.ImageServiceCreateResponse{ Image: testresources.Image1(), - }) + } }, }, }, @@ -102,10 +102,10 @@ func Test_AdminImageCmd_Create(t *testing.T) { WantRequest: &adminv2.ImageServiceCreateRequest{ Image: testresources.Image1(), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ImageServiceCreateResponse{ + WantResponse: func() proto.Message { + return &adminv2.ImageServiceCreateResponse{ Image: testresources.Image1(), - }) + } }, }, }, @@ -149,10 +149,10 @@ func Test_AdminImageCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ImageServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &adminv2.ImageServiceUpdateResponse{ Image: testresources.Image1(), - }) + } }, }, }, @@ -185,10 +185,10 @@ func Test_AdminImageCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ImageServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &adminv2.ImageServiceUpdateResponse{ Image: testresources.Image1(), - }) + } }, }, }, @@ -228,15 +228,15 @@ func Test_AdminImageCmd_Usage(t *testing.T) { WantRequest: &adminv2.ImageServiceUsageRequest{ Query: &apiv2.ImageQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ImageServiceUsageResponse{ + WantResponse: func() proto.Message { + return &adminv2.ImageServiceUsageResponse{ ImageUsage: []*apiv2.ImageUsage{ { Image: testresources.Image1(), UsedBy: []string{"machine-a", "machine-b"}, }, }, - }) + } }, }, }, diff --git a/tests/e2e/admin/ip_test.go b/tests/e2e/admin/ip_test.go index 7eb106f..1b1e781 100644 --- a/tests/e2e/admin/ip_test.go +++ b/tests/e2e/admin/ip_test.go @@ -3,13 +3,13 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_IPCmd_List(t *testing.T) { @@ -23,13 +23,13 @@ func Test_IPCmd_List(t *testing.T) { WantRequest: &adminv2.IPServiceListRequest{ Query: &apiv2.IPQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.IPServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.IPServiceListResponse{ Ips: []*apiv2.IP{ testresources.IP1(), testresources.IP2(), }, - }) + } }, }, }, @@ -75,12 +75,12 @@ func Test_IPCmd_Describe(t *testing.T) { Ip: &testresources.IP1().Ip, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.IPServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.IPServiceListResponse{ Ips: []*apiv2.IP{ testresources.IP1(), }, - }) + } }, }, }, diff --git a/tests/e2e/admin/machine_test.go b/tests/e2e/admin/machine_test.go index 28b694f..ebea3a0 100644 --- a/tests/e2e/admin/machine_test.go +++ b/tests/e2e/admin/machine_test.go @@ -2,12 +2,11 @@ package admin_e2e import ( "encoding/base64" - "fmt" "os" "strings" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -17,6 +16,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_MachineCmd_List(t *testing.T) { @@ -146,13 +146,13 @@ func Test_MachineCmd_List(t *testing.T) { }, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.MachineServiceListResponse{ Machines: []*apiv2.Machine{ testresources.Machine2(), testresources.Machine1(), }, - }) + } }, }, }, @@ -189,13 +189,13 @@ func Test_MachineCmd_List(t *testing.T) { WantRequest: &adminv2.MachineServiceListRequest{ Query: &apiv2.MachineQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.MachineServiceListResponse{ Machines: []*apiv2.Machine{ testresources.Machine2(), testresources.Machine1(), }, - }) + } }, }, }, @@ -223,10 +223,10 @@ func Test_MachineCmd_Describe(t *testing.T) { WantRequest: &adminv2.MachineServiceGetRequest{ Uuid: testresources.Machine2().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceGetResponse{ + WantResponse: func() proto.Message { + return &adminv2.MachineServiceGetResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -340,10 +340,10 @@ func Test_MachineCmd_Create(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceCreateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -384,10 +384,10 @@ func Test_MachineCmd_Create(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceCreateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -414,10 +414,10 @@ func Test_MachineCmd_Delete(t *testing.T) { WantRequest: &adminv2.MachineServiceDeleteRequest{ Uuid: testresources.Machine2().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.MachineServiceDeleteResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -437,10 +437,10 @@ func Test_MachineCmd_Delete(t *testing.T) { WantRequest: &adminv2.MachineServiceDeleteRequest{ Uuid: testresources.Machine2().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.MachineServiceDeleteResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -495,10 +495,10 @@ func Test_MachineCmd_Update(t *testing.T) { }, SshPublicKeys: []string{"12345"}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceUpdateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -530,10 +530,10 @@ func Test_MachineCmd_Update(t *testing.T) { }, SshPublicKeys: []string{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceUpdateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -586,10 +586,10 @@ func Test_MachineCmd_Apply(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceCreateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -634,7 +634,7 @@ func Test_MachineCmd_Apply(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already exists")), + WantError: connect.Errorf(connect.CodeAlreadyExists, "already exists"), }, { WantRequest: &apiv2.MachineServiceUpdateRequest{ @@ -651,10 +651,10 @@ func Test_MachineCmd_Apply(t *testing.T) { }, SshPublicKeys: []string{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceUpdateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -798,13 +798,13 @@ func Test_MachineCmd_BmcList(t *testing.T) { }, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceListBMCResponse{ + WantResponse: func() proto.Message { + return &adminv2.MachineServiceListBMCResponse{ BmcDetails: []*apiv2.MachineBMCDetails{ testresources.Machine2BmcDetails, testresources.Machine1BmcDetails, }, - }) + } }, }, }, @@ -848,10 +848,10 @@ func Test_MachineCmd_BmcDescribe(t *testing.T) { WantRequest: &adminv2.MachineServiceGetBMCRequest{ Uuid: testresources.Machine1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceGetBMCResponse{ + WantResponse: func() proto.Message { + return &adminv2.MachineServiceGetBMCResponse{ BmcDetails: testresources.Machine1BmcDetails, - }) + } }, }, }, @@ -892,8 +892,8 @@ func Test_MachineCmd_BmcCommand(t *testing.T) { Uuid: testresources.Machine1().Uuid, Command: apiv2.MachineBMCCommand_MACHINE_BMC_COMMAND_ON, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.MachineServiceBMCCommandResponse{}) + WantResponse: func() proto.Message { + return &adminv2.MachineServiceBMCCommandResponse{} }, }, }, diff --git a/tests/e2e/admin/network_test.go b/tests/e2e/admin/network_test.go index d0e82f9..39d282c 100644 --- a/tests/e2e/admin/network_test.go +++ b/tests/e2e/admin/network_test.go @@ -5,7 +5,6 @@ import ( "strings" "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -15,6 +14,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/pointer" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_AdminNetworkCmd_List(t *testing.T) { @@ -61,13 +61,13 @@ func Test_AdminNetworkCmd_List(t *testing.T) { }, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceListResponse{ Networks: []*apiv2.Network{ testresources.Network2(), testresources.Network1(), }, - }) + } }, }, }, @@ -111,10 +111,10 @@ func Test_AdminNetworkCmd_Describe(t *testing.T) { WantRequest: &adminv2.NetworkServiceGetRequest{ Id: testresources.Network1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceGetResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceGetResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -205,10 +205,10 @@ func Test_AdminNetworkCmd_Create(t *testing.T) { Ipv6: new(uint32(65)), }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceCreateResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceCreateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -239,10 +239,10 @@ func Test_AdminNetworkCmd_Create(t *testing.T) { Labels: testresources.Network1().Meta.Labels, AddressFamily: apiv2.NetworkAddressFamily_NETWORK_ADDRESS_FAMILY_DUAL_STACK.Enum(), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceCreateResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceCreateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -269,10 +269,10 @@ func Test_AdminNetworkCmd_Delete(t *testing.T) { WantRequest: &adminv2.NetworkServiceDeleteRequest{ Id: testresources.Network1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceDeleteResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -296,10 +296,10 @@ func Test_AdminNetworkCmd_Delete(t *testing.T) { WantRequest: &adminv2.NetworkServiceDeleteRequest{ Id: testresources.Network1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceDeleteResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -331,10 +331,10 @@ func Test_AdminNetworkCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceUpdateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -372,10 +372,10 @@ func Test_AdminNetworkCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.NetworkServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &adminv2.NetworkServiceUpdateResponse{ Network: testresources.Network1(), - }) + } }, }, }, diff --git a/tests/e2e/admin/partition_test.go b/tests/e2e/admin/partition_test.go index 2daac45..9c8e964 100644 --- a/tests/e2e/admin/partition_test.go +++ b/tests/e2e/admin/partition_test.go @@ -3,8 +3,8 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" + "google.golang.org/protobuf/proto" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -24,13 +24,13 @@ func Test_AdminPartitionCmd_List(t *testing.T) { WantRequest: &apiv2.PartitionServiceListRequest{ Query: &apiv2.PartitionQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.PartitionServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.PartitionServiceListResponse{ Partitions: []*apiv2.Partition{ testresources.Partition1(), testresources.Partition2(), }, - }) + } }, }, }, @@ -74,10 +74,10 @@ func Test_AdminPartitionCmd_Describe(t *testing.T) { WantRequest: &apiv2.PartitionServiceGetRequest{ Id: testresources.Partition1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.PartitionServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.PartitionServiceGetResponse{ Partition: testresources.Partition1(), - }) + } }, }, }, @@ -99,8 +99,8 @@ func Test_AdminPartitionCmd_Capacity(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &adminv2.PartitionServiceCapacityRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.PartitionServiceCapacityResponse{ + WantResponse: func() proto.Message { + return &adminv2.PartitionServiceCapacityResponse{ PartitionCapacity: []*adminv2.PartitionCapacity{ { Partition: "partition-1", @@ -117,7 +117,7 @@ func Test_AdminPartitionCmd_Capacity(t *testing.T) { }, }, }, - }) + } }, }, }, @@ -154,8 +154,8 @@ partition-1 size-1 Size: new("size-1"), Project: new("project-123"), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.PartitionServiceCapacityResponse{ + WantResponse: func() proto.Message { + return &adminv2.PartitionServiceCapacityResponse{ PartitionCapacity: []*adminv2.PartitionCapacity{ { Partition: "partition-1", @@ -172,7 +172,7 @@ partition-1 size-1 }, }, }, - }) + } }, }, }, diff --git a/tests/e2e/admin/project_test.go b/tests/e2e/admin/project_test.go index 97f0a8c..669b6da 100644 --- a/tests/e2e/admin/project_test.go +++ b/tests/e2e/admin/project_test.go @@ -3,13 +3,13 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_AdminProjectCmd_List(t *testing.T) { @@ -21,13 +21,13 @@ func Test_AdminProjectCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &adminv2.ProjectServiceListRequest{Query: &apiv2.ProjectQuery{}}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.ProjectServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.ProjectServiceListResponse{ Projects: []*apiv2.Project{ testresources.Project1(), testresources.Project2(), }, - }) + } }, }, }, diff --git a/tests/e2e/admin/size_test.go b/tests/e2e/admin/size_test.go index 1caaefe..2d1a791 100644 --- a/tests/e2e/admin/size_test.go +++ b/tests/e2e/admin/size_test.go @@ -3,7 +3,6 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -12,6 +11,7 @@ import ( e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_AdminSizeCmd_Delete(t *testing.T) { @@ -25,10 +25,10 @@ func Test_AdminSizeCmd_Delete(t *testing.T) { WantRequest: &adminv2.SizeServiceDeleteRequest{ Id: testresources.Size1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SizeServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.SizeServiceDeleteResponse{ Size: testresources.Size1(), - }) + } }, }, }, @@ -69,13 +69,13 @@ func Test_AdminSizeCmd_List(t *testing.T) { WantRequest: &apiv2.SizeServiceListRequest{ Query: &apiv2.SizeQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.SizeServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.SizeServiceListResponse{ Sizes: []*apiv2.Size{ testresources.Size2(), testresources.Size1(), }, - }) + } }, }, }, @@ -123,10 +123,10 @@ func Test_AdminSizeCmd_Create(t *testing.T) { WantRequest: &adminv2.SizeServiceCreateRequest{ Size: testresources.Size1(), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SizeServiceCreateResponse{ + WantResponse: func() proto.Message { + return &adminv2.SizeServiceCreateResponse{ Size: testresources.Size1(), - }) + } }, }, }, @@ -181,10 +181,10 @@ func Test_AdminSizeCmd_Update(t *testing.T) { }, Constraints: testresources.Size1().Constraints, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SizeServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &adminv2.SizeServiceUpdateResponse{ Size: testresources.Size1(), - }) + } }, }, }, diff --git a/tests/e2e/admin/switch_test.go b/tests/e2e/admin/switch_test.go index 163122c..737f3d8 100644 --- a/tests/e2e/admin/switch_test.go +++ b/tests/e2e/admin/switch_test.go @@ -3,7 +3,6 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -12,6 +11,7 @@ import ( e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_AdminSwitchCmd_Describe(t *testing.T) { @@ -25,10 +25,10 @@ func Test_AdminSwitchCmd_Describe(t *testing.T) { WantRequest: &adminv2.SwitchServiceGetRequest{ Id: testresources.Switch2().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServiceGetResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServiceGetResponse{ Switch: testresources.Switch2(), - }) + } }, }, }, @@ -72,13 +72,13 @@ func Test_AdminSwitchCmd_List(t *testing.T) { Os: &apiv2.SwitchOSQuery{}, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServiceListResponse{ Switches: []*apiv2.Switch{ testresources.Switch1(), testresources.Switch2(), }, - }) + } }, }, }, @@ -122,10 +122,10 @@ func Test_AdminSwitchCmd_Delete(t *testing.T) { WantRequest: &adminv2.SwitchServiceDeleteRequest{ Id: testresources.Switch2().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServiceDeleteResponse{ Switch: testresources.Switch2(), - }) + } }, }, }, @@ -158,10 +158,10 @@ func Test_AdminSwitchCmd_Update(t *testing.T) { Os: testresources.Switch2().Os, ReplaceMode: new(testresources.Switch2().ReplaceMode), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServiceUpdateResponse{ Switch: testresources.Switch2(), - }) + } }, }, }, @@ -200,10 +200,10 @@ func Test_AdminSwitchCmd_ConnectedMachines(t *testing.T) { Query: &apiv2.SwitchQuery{}, MachineQuery: &apiv2.MachineQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServiceConnectedMachinesResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServiceConnectedMachinesResponse{ SwitchesWithMachines: []*apiv2.SwitchWithMachines{testresources.SwitchWithMachines1()}, - }) + } }, }, }, @@ -233,12 +233,12 @@ func Test_AdminSwitchCmd_Detail(t *testing.T) { Os: &apiv2.SwitchOSQuery{}, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServiceListResponse{ Switches: []*apiv2.Switch{ testresources.Switch1(), }, - }) + } }, }, }, @@ -275,10 +275,10 @@ func Test_AdminSwitchCmd_Migrate(t *testing.T) { OldSwitch: testresources.Switch1().Id, NewSwitch: testresources.Switch2().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServiceMigrateResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServiceMigrateResponse{ Switch: testresources.Switch2(), - }) + } }, }, }, @@ -322,10 +322,10 @@ func Test_AdminSwitchCmd_Port(t *testing.T) { NicName: testresources.Nic1().Name, Status: apiv2.SwitchPortStatus_SWITCH_PORT_STATUS_UP, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServicePortResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServicePortResponse{ Switch: testresources.Switch1(), - }) + } }, }, }, @@ -395,10 +395,10 @@ Desired: NicName: testresources.Nic1().Name, Status: apiv2.SwitchPortStatus_SWITCH_PORT_STATUS_DOWN, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.SwitchServicePortResponse{ + WantResponse: func() proto.Message { + return &adminv2.SwitchServicePortResponse{ Switch: testresources.Switch1(), - }) + } }, }, }, diff --git a/tests/e2e/admin/task_test.go b/tests/e2e/admin/task_test.go index 1326ee8..40c64b5 100644 --- a/tests/e2e/admin/task_test.go +++ b/tests/e2e/admin/task_test.go @@ -3,12 +3,12 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_AdminTaskCmd_List(t *testing.T) { @@ -20,13 +20,13 @@ func Test_AdminTaskCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &adminv2.TaskServiceListRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TaskServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.TaskServiceListResponse{ Tasks: []*adminv2.TaskInfo{ testresources.Task1(), testresources.Task2(), }, - }) + } }, }, }, @@ -62,12 +62,12 @@ func Test_AdminTaskCmd_List(t *testing.T) { WantRequest: &adminv2.TaskServiceListRequest{ Queue: func() *string { s := "high-priority"; return &s }(), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TaskServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.TaskServiceListResponse{ Tasks: []*adminv2.TaskInfo{ testresources.Task3(), }, - }) + } }, }, }, @@ -95,10 +95,10 @@ func Test_AdminTaskCmd_Describe(t *testing.T) { TaskId: testresources.Task1().Id, Queue: "default", }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TaskServiceGetResponse{ + WantResponse: func() proto.Message { + return &adminv2.TaskServiceGetResponse{ Task: testresources.Task1(), - }) + } }, }, }, @@ -119,10 +119,10 @@ func Test_AdminTaskCmd_Describe(t *testing.T) { TaskId: testresources.Task3().Id, Queue: "high-priority", }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TaskServiceGetResponse{ + WantResponse: func() proto.Message { + return &adminv2.TaskServiceGetResponse{ Task: testresources.Task3(), - }) + } }, }, }, @@ -161,10 +161,10 @@ func Test_AdminTaskQueuesCmd(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &adminv2.TaskServiceQueuesRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TaskServiceQueuesResponse{ + WantResponse: func() proto.Message { + return &adminv2.TaskServiceQueuesResponse{ Queues: []string{"default", "high-priority", "low-priority"}, - }) + } }, }, }, diff --git a/tests/e2e/admin/tenant_test.go b/tests/e2e/admin/tenant_test.go index 62cb850..8785547 100644 --- a/tests/e2e/admin/tenant_test.go +++ b/tests/e2e/admin/tenant_test.go @@ -3,12 +3,12 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -50,10 +50,10 @@ func Test_AdminTenantCmd_Create(t *testing.T) { Description: new(adminTenant1().Description), Email: new(adminTenant1().Email), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TenantServiceCreateResponse{ + WantResponse: func() proto.Message { + return &adminv2.TenantServiceCreateResponse{ Tenant: adminTenant1(), - }) + } }, }, }, @@ -75,13 +75,13 @@ func Test_AdminTenantCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &adminv2.TenantServiceListRequest{Query: &apiv2.TenantQuery{}}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TenantServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.TenantServiceListResponse{ Tenants: []*apiv2.Tenant{ adminTenant1(), adminTenant2(), }, - }) + } }, }, }, diff --git a/tests/e2e/admin/token_test.go b/tests/e2e/admin/token_test.go index 48644f2..ac4b8da 100644 --- a/tests/e2e/admin/token_test.go +++ b/tests/e2e/admin/token_test.go @@ -3,13 +3,13 @@ package admin_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_AdminTokenCmd_List(t *testing.T) { @@ -21,13 +21,13 @@ func Test_AdminTokenCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &adminv2.TokenServiceListRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TokenServiceListResponse{ + WantResponse: func() proto.Message { + return &adminv2.TokenServiceListResponse{ Tokens: []*apiv2.Token{ testresources.Token1(), testresources.Token2(), }, - }) + } }, }, }, @@ -72,8 +72,8 @@ func Test_AdminTokenCmd_Delete(t *testing.T) { Uuid: testresources.Token1().Uuid, User: "user-123", }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.TokenServiceRevokeResponse{}) + WantResponse: func() proto.Message { + return &adminv2.TokenServiceRevokeResponse{} }, }, }, diff --git a/tests/e2e/admin/vpn_test.go b/tests/e2e/admin/vpn_test.go index 5fdec98..3e89d4d 100644 --- a/tests/e2e/admin/vpn_test.go +++ b/tests/e2e/admin/vpn_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -24,13 +24,13 @@ func Test_AdminVpnCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &adminv2.VPNServiceListNodesRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.VPNServiceListNodesResponse{ + WantResponse: func() proto.Message { + return &adminv2.VPNServiceListNodesResponse{ Nodes: []*apiv2.VPNNode{ testresources.VpnNode2(), testresources.VpnNode1(), }, - }) + } }, }, }, @@ -72,14 +72,14 @@ func Test_AdminVpnCmd_AuthKey(t *testing.T) { Expires: durationpb.New(1 * time.Hour), Reason: "", }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&adminv2.VPNServiceAuthKeyResponse{ + WantResponse: func() proto.Message { + return &adminv2.VPNServiceAuthKeyResponse{ Address: "1.2.3.4", AuthKey: "abcdefghikl", Ephemeral: true, ExpiresAt: timestamppb.New(e2e.TimeBubbleStartTime().Add(1 * time.Hour)), CreatedAt: timestamppb.New(e2e.TimeBubbleStartTime()), - }) + } }, }, }, diff --git a/tests/e2e/api/audit_test.go b/tests/e2e/api/audit_test.go index 5892630..88165b5 100644 --- a/tests/e2e/api/audit_test.go +++ b/tests/e2e/api/audit_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -25,13 +25,13 @@ func Test_AuditCmd_List(t *testing.T) { Login: testresources.Trace1().Tenant, Query: &apiv2.AuditQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.AuditServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.AuditServiceListResponse{ Traces: []*apiv2.AuditTrace{ testresources.Trace1(), testresources.Trace2(), }, - }) + } }, }, }, @@ -71,12 +71,12 @@ d1ff7267-2fbb-4a63-a7c1-44f1a83381a7 me 2`), To: timestamppb.New(time.Date(2001, 1, 2, 0, 0, 0, 0, time.UTC)), }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.AuditServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.AuditServiceListResponse{ Traces: []*apiv2.AuditTrace{ testresources.Trace3(), }, - }) + } }, }, }, @@ -110,10 +110,10 @@ d1ff7267-2fbb-4a63-a7c1-44f1a83381a7 me 2`), Login: "notExisting", Query: &apiv2.AuditQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.AuditServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.AuditServiceListResponse{ Traces: []*apiv2.AuditTrace{}, - }) + } }, }, }, @@ -149,10 +149,10 @@ func Test_AuditCmd_Describe(t *testing.T) { Login: testresources.Trace1().Tenant, Uuid: testresources.Trace1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.AuditServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.AuditServiceGetResponse{ Trace: testresources.Trace1(), - }) + } }, }, }, diff --git a/tests/e2e/api/health_test.go b/tests/e2e/api/health_test.go index ad45d7a..df525b5 100644 --- a/tests/e2e/api/health_test.go +++ b/tests/e2e/api/health_test.go @@ -3,11 +3,11 @@ package api_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) var ( @@ -33,10 +33,10 @@ func Test_HealthCmd(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &apiv2.HealthServiceGetRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.HealthServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.HealthServiceGetResponse{ Health: health1(), - }) + } }, }, }, diff --git a/tests/e2e/api/image_test.go b/tests/e2e/api/image_test.go index e01f24a..10382c5 100644 --- a/tests/e2e/api/image_test.go +++ b/tests/e2e/api/image_test.go @@ -3,12 +3,12 @@ package api_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_ImageCmd_List(t *testing.T) { @@ -22,13 +22,13 @@ func Test_ImageCmd_List(t *testing.T) { WantRequest: &apiv2.ImageServiceListRequest{ Query: &apiv2.ImageQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ImageServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.ImageServiceListResponse{ Images: []*apiv2.Image{ testresources.Image1(), testresources.Image2(), }, - }) + } }, }, }, @@ -73,10 +73,10 @@ func Test_ImageCmd_Describe(t *testing.T) { WantRequest: &apiv2.ImageServiceGetRequest{ Id: testresources.Image1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ImageServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.ImageServiceGetResponse{ Image: testresources.Image1(), - }) + } }, }, }, @@ -117,10 +117,10 @@ func Test_ImageCmd_Latest(t *testing.T) { WantRequest: &apiv2.ImageServiceLatestRequest{ Os: testresources.Image1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ImageServiceLatestResponse{ + WantResponse: func() proto.Message { + return &apiv2.ImageServiceLatestResponse{ Image: testresources.Image1(), - }) + } }, }, }, diff --git a/tests/e2e/api/ip_test.go b/tests/e2e/api/ip_test.go index f9ab8fa..fc33f5b 100644 --- a/tests/e2e/api/ip_test.go +++ b/tests/e2e/api/ip_test.go @@ -1,10 +1,9 @@ package api_e2e import ( - "fmt" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" @@ -13,6 +12,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/pointer" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_IPCmd_List(t *testing.T) { @@ -27,13 +27,13 @@ func Test_IPCmd_List(t *testing.T) { Project: testresources.IP1().Project, Query: &apiv2.IPQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceListResponse{ Ips: []*apiv2.IP{ testresources.IP1(), testresources.IP2(), }, - }) + } }, }, }, @@ -93,12 +93,12 @@ func Test_IPCmd_List(t *testing.T) { }, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceListResponse{ Ips: []*apiv2.IP{ testresources.IP1(), }, - }) + } }, }, }, @@ -126,10 +126,10 @@ func Test_IPCmd_Describe(t *testing.T) { Ip: testresources.IP1().Ip, Project: testresources.IP1().Project, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceGetResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -172,10 +172,10 @@ func Test_IPCmd_Create(t *testing.T) { Network: testresources.IP1().Network, Type: &testresources.IP1().Type, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceCreateResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -202,10 +202,10 @@ func Test_IPCmd_Create(t *testing.T) { Type: &testresources.IP1().Type, AddressFamily: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceCreateResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -233,10 +233,10 @@ func Test_IPCmd_Delete(t *testing.T) { Ip: testresources.IP1().Ip, Project: testresources.IP1().Project, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceDeleteResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -257,10 +257,10 @@ func Test_IPCmd_Delete(t *testing.T) { Ip: testresources.IP1().Ip, Project: testresources.IP1().Project, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceDeleteResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -294,10 +294,10 @@ func Test_IPCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceUpdateResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -340,10 +340,10 @@ func Test_IPCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceUpdateResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -382,10 +382,10 @@ func Test_IPCmd_Apply(t *testing.T) { Type: &testresources.IP1().Type, AddressFamily: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceCreateResponse{ Ip: testresources.IP1(), - }) + } }, }, }, @@ -416,7 +416,7 @@ func Test_IPCmd_Apply(t *testing.T) { Type: &testresources.IP1().Type, AddressFamily: nil, }, - WantError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already exists")), + WantError: connect.Errorf(connect.CodeAlreadyExists, "already exists"), }, { WantRequest: &apiv2.IPServiceUpdateRequest{ @@ -435,10 +435,10 @@ func Test_IPCmd_Apply(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.IPServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.IPServiceUpdateResponse{ Ip: testresources.IP1(), - }) + } }, }, }, diff --git a/tests/e2e/api/machine_test.go b/tests/e2e/api/machine_test.go index 97acf60..4fb01ff 100644 --- a/tests/e2e/api/machine_test.go +++ b/tests/e2e/api/machine_test.go @@ -2,12 +2,11 @@ package api_e2e import ( "encoding/base64" - "fmt" "os" "strings" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" @@ -16,6 +15,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_MachineCmd_List(t *testing.T) { @@ -30,12 +30,12 @@ func Test_MachineCmd_List(t *testing.T) { Project: testresources.Project2().Uuid, Query: &apiv2.MachineQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceListResponse{ Machines: []*apiv2.Machine{ testresources.Machine2(), }, - }) + } }, }, }, @@ -77,10 +77,10 @@ func Test_MachineCmd_Describe(t *testing.T) { Uuid: testresources.Machine2().Uuid, Project: testresources.Project2().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceGetResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -191,10 +191,10 @@ func Test_MachineCmd_Create(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceCreateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -236,10 +236,10 @@ func Test_MachineCmd_Create(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceCreateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -267,10 +267,10 @@ func Test_MachineCmd_Delete(t *testing.T) { Project: testresources.Project2().Uuid, Uuid: testresources.Machine2().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceDeleteResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -291,10 +291,10 @@ func Test_MachineCmd_Delete(t *testing.T) { Uuid: testresources.Machine2().Uuid, Project: testresources.Machine2().Allocation.Project, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceDeleteResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -349,10 +349,10 @@ func Test_MachineCmd_Update(t *testing.T) { }, SshPublicKeys: []string{"12345"}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceUpdateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -384,10 +384,10 @@ func Test_MachineCmd_Update(t *testing.T) { }, SshPublicKeys: []string{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceUpdateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -441,10 +441,10 @@ func Test_MachineCmd_Apply(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceCreateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, @@ -490,7 +490,7 @@ func Test_MachineCmd_Apply(t *testing.T) { AllocationType: apiv2.MachineAllocationType_MACHINE_ALLOCATION_TYPE_MACHINE, FirewallSpec: nil, }, - WantError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already exists")), + WantError: connect.Errorf(connect.CodeAlreadyExists, "already exists"), }, { WantRequest: &apiv2.MachineServiceUpdateRequest{ @@ -507,10 +507,10 @@ func Test_MachineCmd_Apply(t *testing.T) { }, SshPublicKeys: []string{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.MachineServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.MachineServiceUpdateResponse{ Machine: testresources.Machine2(), - }) + } }, }, }, diff --git a/tests/e2e/api/network_test.go b/tests/e2e/api/network_test.go index e7bc07e..20b3516 100644 --- a/tests/e2e/api/network_test.go +++ b/tests/e2e/api/network_test.go @@ -1,12 +1,11 @@ package api_e2e import ( - "fmt" "strconv" "strings" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" @@ -15,6 +14,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/pointer" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_NetworkCmd_List(t *testing.T) { @@ -61,13 +61,13 @@ func Test_NetworkCmd_List(t *testing.T) { }, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceListResponse{ Networks: []*apiv2.Network{ testresources.Network1(), testresources.Network2(), }, - }) + } }, }, }, @@ -112,10 +112,10 @@ func Test_NetworkCmd_Describe(t *testing.T) { Id: testresources.Network1().Id, Project: "", }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceGetResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -163,10 +163,10 @@ func Test_NetworkCmd_Create(t *testing.T) { Partition: testresources.Network1().Partition, Length: &apiv2.ChildPrefixLength{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceCreateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -192,10 +192,10 @@ func Test_NetworkCmd_Create(t *testing.T) { ParentNetwork: testresources.Network1().ParentNetwork, AddressFamily: apiv2.NetworkAddressFamily_NETWORK_ADDRESS_FAMILY_DUAL_STACK.Enum(), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceCreateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -223,10 +223,10 @@ func Test_NetworkCmd_Delete(t *testing.T) { Id: testresources.Network1().Id, Project: *testresources.Network1().Project, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceDeleteResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -247,10 +247,10 @@ func Test_NetworkCmd_Delete(t *testing.T) { Id: testresources.Network1().Id, Project: *testresources.Network1().Project, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceDeleteResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -283,10 +283,10 @@ func Test_NetworkCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceUpdateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -327,10 +327,10 @@ func Test_NetworkCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceUpdateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -367,10 +367,10 @@ func Test_NetworkCmd_Apply(t *testing.T) { ParentNetwork: testresources.Network1().ParentNetwork, AddressFamily: apiv2.NetworkAddressFamily_NETWORK_ADDRESS_FAMILY_DUAL_STACK.Enum(), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceCreateResponse{ Network: testresources.Network1(), - }) + } }, }, }, @@ -399,7 +399,7 @@ func Test_NetworkCmd_Apply(t *testing.T) { ParentNetwork: testresources.Network1().ParentNetwork, AddressFamily: apiv2.NetworkAddressFamily_NETWORK_ADDRESS_FAMILY_DUAL_STACK.Enum(), }, - WantError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already exists")), + WantError: connect.Errorf(connect.CodeAlreadyExists, "already exists"), }, { WantRequest: &apiv2.NetworkServiceUpdateRequest{ @@ -418,10 +418,10 @@ func Test_NetworkCmd_Apply(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.NetworkServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.NetworkServiceUpdateResponse{ Network: testresources.Network1(), - }) + } }, }, }, diff --git a/tests/e2e/api/project_test.go b/tests/e2e/api/project_test.go index 1b2864b..c9e64a5 100644 --- a/tests/e2e/api/project_test.go +++ b/tests/e2e/api/project_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "github.com/dustin/go-humanize" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -13,6 +13,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_ProjectCmd_Describe(t *testing.T) { @@ -26,10 +27,10 @@ func Test_ProjectCmd_Describe(t *testing.T) { WantRequest: &apiv2.ProjectServiceGetRequest{ Project: testresources.Project1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceGetResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -72,10 +73,10 @@ func Test_ProjectCmd_Create(t *testing.T) { Name: testresources.Project1().Name, Description: testresources.Project1().Description, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceCreateResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -96,10 +97,10 @@ func Test_ProjectCmd_Create(t *testing.T) { Name: testresources.Project1().Name, Description: testresources.Project1().Description, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceCreateResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -123,10 +124,10 @@ func Test_ProjectCmd_Create(t *testing.T) { Name: testresources.Project1().Name, Description: testresources.Project1().Description, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceCreateResponse{ Project: testresources.Project1(), - }) + } }, }, { @@ -135,10 +136,10 @@ func Test_ProjectCmd_Create(t *testing.T) { Name: testresources.Project2().Name, Description: testresources.Project2().Description, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceCreateResponse{ Project: testresources.Project2(), - }) + } }, }, }, @@ -166,10 +167,10 @@ func Test_ProjectCmd_Delete(t *testing.T) { WantRequest: &apiv2.ProjectServiceDeleteRequest{ Project: testresources.Project1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceDeleteResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -188,10 +189,10 @@ func Test_ProjectCmd_Delete(t *testing.T) { WantRequest: &apiv2.ProjectServiceDeleteRequest{ Project: testresources.Project1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceDeleteResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -220,10 +221,10 @@ func Test_ProjectCmd_Update(t *testing.T) { Name: new("new-name"), Description: new("new-desc"), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceUpdateResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -244,10 +245,10 @@ func Test_ProjectCmd_Update(t *testing.T) { Name: new(testresources.Project1().Name), Description: new(testresources.Project1().Description), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceUpdateResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -272,13 +273,13 @@ func Test_ProjectCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &apiv2.ProjectServiceListRequest{Query: &apiv2.ProjectQuery{}}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceListResponse{ Projects: []*apiv2.Project{ testresources.Project1(), testresources.Project2(), }, - }) + } }, }, }, @@ -329,10 +330,10 @@ func Test_ProjectCmd_Apply(t *testing.T) { Description: testresources.Project1().Description, Labels: testresources.Project1().Meta.Labels, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceCreateResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -358,7 +359,7 @@ func Test_ProjectCmd_Apply(t *testing.T) { Name: testresources.Project1().Name, Description: testresources.Project1().Description, }, - WantError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already exists")), + WantError: connect.Errorf(connect.CodeAlreadyExists, "already exists"), }, { WantRequest: &apiv2.ProjectServiceUpdateRequest{ @@ -366,10 +367,10 @@ func Test_ProjectCmd_Apply(t *testing.T) { Description: &testresources.Project1().Description, Name: &testresources.Project1().Name, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceUpdateResponse{ Project: testresources.Project1(), - }) + } }, }, }, @@ -395,13 +396,13 @@ func Test_ProjectCmd_ListInvites(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &apiv2.ProjectServiceInvitesListRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceInvitesListResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceInvitesListResponse{ Invites: []*apiv2.ProjectInvite{ testresources.Project1Invite(), testresources.Project2Invite(), }, - }) + } }, }, }, @@ -446,8 +447,8 @@ func Test_ProjectCmd_DeleteInvite(t *testing.T) { Project: testresources.Project1().Uuid, Secret: testresources.Project1Invite().Secret, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceInviteDeleteResponse{}) + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceInviteDeleteResponse{} }, }, }, @@ -472,10 +473,10 @@ func Test_ProjectCmd_CreateInvite(t *testing.T) { Project: testresources.Project1().Uuid, Role: testresources.Project1Invite().Role, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceInviteResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceInviteResponse{ Invite: testresources.Project1Invite(), - }) + } }, }, }, @@ -503,21 +504,21 @@ func Test_ProjectCmd_Join(t *testing.T) { WantRequest: &apiv2.ProjectServiceInviteGetRequest{ Secret: testresources.Project1Invite().Secret, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceInviteGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceInviteGetResponse{ Invite: testresources.Project1Invite(), - }) + } }, }, { WantRequest: &apiv2.ProjectServiceInviteAcceptRequest{ Secret: testresources.Project1Invite().Secret, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceInviteAcceptResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceInviteAcceptResponse{ Project: testresources.Project1().Uuid, ProjectName: testresources.Project1Invite().ProjectName, - }) + } }, }, }, @@ -544,13 +545,13 @@ func Test_ProjectCmd_ListMembers(t *testing.T) { WantRequest: &apiv2.ProjectServiceGetRequest{ Project: testresources.Project1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceGetResponse{ Project: testresources.Project1(), ProjectMembers: []*apiv2.ProjectMember{ testresources.Project1Members(), testresources.Project2Members(), }, - }) + } }, }, }, @@ -595,8 +596,8 @@ func Test_ProjectCmd_DeleteMember(t *testing.T) { Project: testresources.Project1().Uuid, Member: testresources.Project1Members().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceRemoveMemberResponse{}) + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceRemoveMemberResponse{} }, }, }, @@ -622,10 +623,10 @@ func Test_ProjectCmd_UpdateMember(t *testing.T) { Member: testresources.Project1Members().Id, Role: testresources.Project1Members().Role, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.ProjectServiceUpdateMemberResponse{ + WantResponse: func() proto.Message { + return &apiv2.ProjectServiceUpdateMemberResponse{ ProjectMember: testresources.Project1Members(), - }) + } }, }, }, diff --git a/tests/e2e/api/size_test.go b/tests/e2e/api/size_test.go index a1c3a97..4492b2a 100644 --- a/tests/e2e/api/size_test.go +++ b/tests/e2e/api/size_test.go @@ -3,12 +3,12 @@ package api_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" e2e "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_SizeCmd_List(t *testing.T) { @@ -22,13 +22,13 @@ func Test_SizeCmd_List(t *testing.T) { WantRequest: &apiv2.SizeServiceListRequest{ Query: &apiv2.SizeQuery{}, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.SizeServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.SizeServiceListResponse{ Sizes: []*apiv2.Size{ testresources.Size2(), testresources.Size1(), }, - }) + } }, }, }, @@ -72,10 +72,10 @@ func Test_SizeCmd_Describe(t *testing.T) { WantRequest: &apiv2.SizeServiceGetRequest{ Id: testresources.Size1().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.SizeServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.SizeServiceGetResponse{ Size: testresources.Size1(), - }) + } }, }, }, diff --git a/tests/e2e/api/tenant_test.go b/tests/e2e/api/tenant_test.go index d806fe0..4e980e3 100644 --- a/tests/e2e/api/tenant_test.go +++ b/tests/e2e/api/tenant_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "github.com/dustin/go-humanize" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" @@ -13,6 +13,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" ) func Test_TenantCmd_Describe(t *testing.T) { @@ -26,10 +27,10 @@ func Test_TenantCmd_Describe(t *testing.T) { WantRequest: &apiv2.TenantServiceGetRequest{ Login: testresources.Tenant1().Login, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceGetResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -68,13 +69,13 @@ func Test_TenantCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &apiv2.TenantServiceListRequest{Query: &apiv2.TenantQuery{}}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceListResponse{ Tenants: []*apiv2.Tenant{ testresources.Tenant1(), testresources.Tenant2(), }, - }) + } }, }, }, @@ -120,10 +121,10 @@ func Test_TenantCmd_Create(t *testing.T) { Name: testresources.Tenant1().Name, Email: &testresources.Tenant1().Email, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceCreateResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -145,10 +146,10 @@ func Test_TenantCmd_Create(t *testing.T) { Email: &testresources.Tenant1().Email, AvatarUrl: new(""), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceCreateResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -173,10 +174,10 @@ func Test_TenantCmd_Create(t *testing.T) { AvatarUrl: new(""), Email: &testresources.Tenant1().Email, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceCreateResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, { @@ -186,10 +187,10 @@ func Test_TenantCmd_Create(t *testing.T) { Email: &testresources.Tenant2().Email, AvatarUrl: new(""), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceCreateResponse{ Tenant: testresources.Tenant2(), - }) + } }, }, }, @@ -217,10 +218,10 @@ func Test_TenantCmd_Delete(t *testing.T) { WantRequest: &apiv2.TenantServiceDeleteRequest{ Login: testresources.Tenant1().Login, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceDeleteResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -239,10 +240,10 @@ func Test_TenantCmd_Delete(t *testing.T) { WantRequest: &apiv2.TenantServiceDeleteRequest{ Login: testresources.Tenant1().Login, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceDeleteResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceDeleteResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -271,10 +272,10 @@ func Test_TenantCmd_Update(t *testing.T) { Name: new("new-name"), Description: new("new-desc"), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceUpdateResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -296,10 +297,10 @@ func Test_TenantCmd_Update(t *testing.T) { Email: new(testresources.Tenant1().Email), Description: new(testresources.Tenant1().Description), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceUpdateResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -333,10 +334,10 @@ func Test_TenantCmd_Apply(t *testing.T) { Name: testresources.Tenant1().Name, AvatarUrl: new(""), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceCreateResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -363,7 +364,7 @@ func Test_TenantCmd_Apply(t *testing.T) { Name: testresources.Tenant1().Name, AvatarUrl: new(""), }, - WantError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already exists")), + WantError: connect.Errorf(connect.CodeAlreadyExists, "already exists"), }, { WantRequest: &apiv2.TenantServiceUpdateRequest{ @@ -372,10 +373,10 @@ func Test_TenantCmd_Apply(t *testing.T) { Description: new(testresources.Tenant1().Description), Name: new(testresources.Tenant1().Name), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceUpdateResponse{ Tenant: testresources.Tenant1(), - }) + } }, }, }, @@ -403,13 +404,13 @@ func Test_TenantCmd_ListMembers(t *testing.T) { WantRequest: &apiv2.TenantServiceGetRequest{ Login: testresources.Tenant1().Login, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceGetResponse{ Tenant: testresources.Tenant1(), TenantMembers: []*apiv2.TenantMember{ testresources.Tenant1Members(), testresources.Tenant2Members(), }, - }) + } }, }, }, @@ -454,8 +455,8 @@ func Test_TenantCmd_DeleteMember(t *testing.T) { Login: testresources.Tenant1().Login, Member: testresources.Tenant1Members().Id, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceRemoveMemberResponse{}) + WantResponse: func() proto.Message { + return &apiv2.TenantServiceRemoveMemberResponse{} }, }, }, @@ -481,10 +482,10 @@ func Test_TenantCmd_UpdateMember(t *testing.T) { Member: testresources.Tenant1Members().Id, Role: testresources.Tenant1Members().Role, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceUpdateMemberResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceUpdateMemberResponse{ TenantMember: testresources.Tenant1Members(), - }) + } }, }, }, @@ -512,13 +513,13 @@ func Test_TenantCmd_ListInvites(t *testing.T) { WantRequest: &apiv2.TenantServiceInvitesListRequest{ Login: testresources.Tenant2().Login, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceInvitesListResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceInvitesListResponse{ Invites: []*apiv2.TenantInvite{ testresources.Tenant1Invite(), testresources.Tenant2Invite(), }, - }) + } }, }, }, @@ -563,8 +564,8 @@ func Test_TenantCmd_DeleteInvite(t *testing.T) { Login: testresources.Tenant1().Login, Secret: testresources.Tenant1Invite().Secret, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceInviteDeleteResponse{}) + WantResponse: func() proto.Message { + return &apiv2.TenantServiceInviteDeleteResponse{} }, }, }, @@ -589,10 +590,10 @@ func Test_TenantCmd_CreateInvite(t *testing.T) { Login: testresources.Tenant1().Login, Role: testresources.Tenant1Invite().Role, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceInviteResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceInviteResponse{ Invite: testresources.Tenant1Invite(), - }) + } }, }, }, @@ -620,21 +621,21 @@ func Test_TenantCmd_Join(t *testing.T) { WantRequest: &apiv2.TenantServiceInviteGetRequest{ Secret: testresources.Tenant1Invite().Secret, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceInviteGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceInviteGetResponse{ Invite: testresources.Tenant1Invite(), - }) + } }, }, { WantRequest: &apiv2.TenantServiceInviteAcceptRequest{ Secret: testresources.Tenant1Invite().Secret, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TenantServiceInviteAcceptResponse{ + WantResponse: func() proto.Message { + return &apiv2.TenantServiceInviteAcceptResponse{ Tenant: testresources.Tenant1().Login, TenantName: testresources.Tenant1Invite().TargetTenantName, - }) + } }, }, }, diff --git a/tests/e2e/api/token_test.go b/tests/e2e/api/token_test.go index 9e21313..34aa0a6 100644 --- a/tests/e2e/api/token_test.go +++ b/tests/e2e/api/token_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "connectrpc.com/connect" + "connectrpc.com/connect/v2" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" @@ -12,6 +12,7 @@ import ( "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" "github.com/spf13/afero" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/durationpb" ) @@ -26,10 +27,10 @@ func Test_TokenCmd_Describe(t *testing.T) { WantRequest: &apiv2.TokenServiceGetRequest{ Uuid: testresources.Token1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.TokenServiceGetResponse{ Token: testresources.Token1(), - }) + } }, }, }, @@ -68,13 +69,13 @@ func Test_TokenCmd_List(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &apiv2.TokenServiceListRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceListResponse{ + WantResponse: func() proto.Message { + return &apiv2.TokenServiceListResponse{ Tokens: []*apiv2.Token{ testresources.Token1(), testresources.Token2(), }, - }) + } }, }, }, @@ -118,8 +119,8 @@ func Test_TokenCmd_Delete(t *testing.T) { WantRequest: &apiv2.TokenServiceRevokeRequest{ Uuid: testresources.Token1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceRevokeResponse{}) + WantResponse: func() proto.Message { + return &apiv2.TokenServiceRevokeResponse{} }, }, }, @@ -139,8 +140,8 @@ func Test_TokenCmd_Delete(t *testing.T) { WantRequest: &apiv2.TokenServiceRevokeRequest{ Uuid: testresources.Token1().Uuid, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceRevokeResponse{}) + WantResponse: func() proto.Message { + return &apiv2.TokenServiceRevokeResponse{} }, }, }, @@ -169,11 +170,11 @@ func Test_TokenCmd_Create(t *testing.T) { Description: testresources.Token1().Description, Expires: durationpb.New(testresources.Token1().Expires.AsTime().Sub(e2e.TimeBubbleStartTime())), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TokenServiceCreateResponse{ Token: testresources.Token1(), Secret: "token-secret", - }) + } }, }, }, @@ -202,11 +203,11 @@ func Test_TokenCmd_Create(t *testing.T) { Description: testresources.Token1().Description, Expires: durationpb.New(testresources.Token1().Expires.AsTime().Sub(e2e.TimeBubbleStartTime())), }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TokenServiceCreateResponse{ Token: testresources.Token1(), Secret: "token-secret", - }) + } }, }, }, @@ -265,10 +266,10 @@ func Test_TokenCmd_Update(t *testing.T) { LockingStrategy: apiv2.OptimisticLockingStrategy_OPTIMISTIC_LOCKING_STRATEGY_SERVER, }, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceUpdateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TokenServiceUpdateResponse{ Token: testresources.Token2(), - }) + } }, }, }, @@ -305,10 +306,10 @@ func Test_TokenCmd_Apply(t *testing.T) { Expires: durationpb.New(testresources.Token1().Expires.AsTime().Sub(e2e.TimeBubbleStartTime())), // Permissions: testresources.Token1().Permissions, }, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.TokenServiceCreateResponse{ + WantResponse: func() proto.Message { + return &apiv2.TokenServiceCreateResponse{ Token: testresources.Token1(), - }) + } }, }, }, @@ -339,7 +340,7 @@ func Test_TokenCmd_Apply(t *testing.T) { Expires: durationpb.New(testresources.Token1().Expires.AsTime().Sub(e2e.TimeBubbleStartTime())), // Permissions: testresources.Token1().Permissions, }, - WantError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already_exists")), + WantError: connect.Errorf(connect.CodeAlreadyExists, "already_exists"), }, }, }, diff --git a/tests/e2e/api/user_test.go b/tests/e2e/api/user_test.go index 261a846..2acbe28 100644 --- a/tests/e2e/api/user_test.go +++ b/tests/e2e/api/user_test.go @@ -3,12 +3,12 @@ package api_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_UserCmd_Describe(t *testing.T) { @@ -20,10 +20,10 @@ func Test_UserCmd_Describe(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &apiv2.UserServiceGetRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.UserServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.UserServiceGetResponse{ User: testresources.User(), - }) + } }, }, }, diff --git a/tests/e2e/api/version_test.go b/tests/e2e/api/version_test.go index 724409f..b23ecf6 100644 --- a/tests/e2e/api/version_test.go +++ b/tests/e2e/api/version_test.go @@ -3,12 +3,12 @@ package api_e2e import ( "testing" - "connectrpc.com/connect" "github.com/metal-stack/api/go/client" apiv2 "github.com/metal-stack/api/go/metalstack/api/v2" e2erootcmd "github.com/metal-stack/cli/testing/e2e" "github.com/metal-stack/cli/tests/e2e/testresources" "github.com/metal-stack/metal-lib/pkg/genericcli/e2e" + "google.golang.org/protobuf/proto" ) func Test_VersionCmd(t *testing.T) { @@ -20,10 +20,10 @@ func Test_VersionCmd(t *testing.T) { ClientCalls: []client.ClientCall{ { WantRequest: &apiv2.VersionServiceGetRequest{}, - WantResponse: func() connect.AnyResponse { - return connect.NewResponse(&apiv2.VersionServiceGetResponse{ + WantResponse: func() proto.Message { + return &apiv2.VersionServiceGetResponse{ Version: testresources.Version(), - }) + } }, }, },