From efd479c736d8cf5fefdfd4118ce7d24d8e6383cd Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Mon, 20 Mar 2023 10:03:24 +0100 Subject: [PATCH] Update buf and go (#1) --- .github/workflows/build.yml | 10 +++---- Makefile | 2 +- go.mod | 20 +++++++------- go.sum | 20 ++++++++++++++ pkg/apis/v1/cluster.pb.go | 2 +- pkg/apis/v1/cluster_grpc.pb.go | 27 +++++++++++++------ pkg/apis/v1/common.pb.go | 2 +- pkg/apis/v1/info.pb.go | 2 +- pkg/apis/v1/info_grpc.pb.go | 17 +++++++++--- pkg/apis/v1/ip.pb.go | 2 +- pkg/apis/v1/ip_grpc.pb.go | 27 +++++++++++++------ pkg/apis/v1/network_traffic.pb.go | 6 ++--- pkg/apis/v1/network_traffic_grpc.pb.go | 17 +++++++++--- pkg/apis/v1/pod.pb.go | 2 +- pkg/apis/v1/pod_grpc.pb.go | 27 +++++++++++++------ pkg/apis/v1/postgres.pb.go | 2 +- pkg/apis/v1/postgres_grpc.pb.go | 27 +++++++++++++------ pkg/apis/v1/s3.pb.go | 2 +- pkg/apis/v1/s3_grpc.pb.go | 17 +++++++++--- pkg/apis/v1/volume.pb.go | 2 +- pkg/apis/v1/volume_grpc.pb.go | 27 +++++++++++++------ proto/buf.gen.yaml | 6 ++--- test/mocks/v1/ClusterServiceClient.go | 26 +++++++++++++----- test/mocks/v1/ClusterServiceServer.go | 26 +++++++++++++----- test/mocks/v1/IPServiceClient.go | 26 +++++++++++++----- test/mocks/v1/IPServiceServer.go | 26 +++++++++++++----- test/mocks/v1/InfoServiceClient.go | 16 +++++++---- test/mocks/v1/InfoServiceServer.go | 16 +++++++---- test/mocks/v1/NetworkTrafficServiceClient.go | 16 +++++++---- test/mocks/v1/NetworkTrafficServiceServer.go | 16 +++++++---- test/mocks/v1/PodServiceClient.go | 26 +++++++++++++----- test/mocks/v1/PodServiceServer.go | 26 +++++++++++++----- test/mocks/v1/PostgresServiceClient.go | 26 +++++++++++++----- test/mocks/v1/PostgresServiceServer.go | 26 +++++++++++++----- test/mocks/v1/S3ServiceClient.go | 16 +++++++---- test/mocks/v1/S3ServiceServer.go | 16 +++++++---- test/mocks/v1/UnsafeClusterServiceServer.go | 6 ++--- test/mocks/v1/UnsafeIPServiceServer.go | 6 ++--- test/mocks/v1/UnsafeInfoServiceServer.go | 6 ++--- .../v1/UnsafeNetworkTrafficServiceServer.go | 6 ++--- test/mocks/v1/UnsafePodServiceServer.go | 6 ++--- test/mocks/v1/UnsafePostgresServiceServer.go | 6 ++--- test/mocks/v1/UnsafeS3ServiceServer.go | 6 ++--- test/mocks/v1/UnsafeVolumeServiceServer.go | 6 ++--- test/mocks/v1/VolumeServiceClient.go | 26 +++++++++++++----- test/mocks/v1/VolumeServiceServer.go | 26 +++++++++++++----- 46 files changed, 464 insertions(+), 206 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2aafa9b..97339af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,18 +16,18 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - name: Set up Go 1.18 - uses: actions/setup-go@v2 + - name: Set up Go 1.20 + uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: "1.20" id: go - name: Check out code into the Go module directory - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: setup buf uses: bufbuild/buf-setup-action@v1 with: - version: '1.4.0' + version: '1.15.0' - name: make run: | make diff --git a/Makefile b/Makefile index 14f42d9..fece39e 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ proto: .PHONY: mocks mocks: rm -rf test/mocks - docker run --rm --user $$(id -u):$$(id -g) -w /work -v ${PWD}:/work vektra/mockery:v2.12.3 --keeptree --all --dir pkg/apis --output test/mocks + docker run --rm --user $$(id -u):$$(id -g) -w /work -v ${PWD}:/work vektra/mockery:v2.22.1 --keeptree --all --dir pkg/apis --output test/mocks .PHONY: test test: diff --git a/go.mod b/go.mod index 1812ca7..8445516 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,21 @@ module github.com/fi-ts/accounting-go -go 1.18 +go 1.20 require ( - github.com/stretchr/testify v1.7.1 - golang.org/x/net v0.0.0-20220531201128-c960675eff93 - google.golang.org/grpc v1.47.0 - google.golang.org/protobuf v1.28.0 + github.com/stretchr/testify v1.8.2 + golang.org/x/net v0.8.0 + google.golang.org/grpc v1.53.0 + google.golang.org/protobuf v1.30.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.4.0 // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/text v0.3.7 // indirect - google.golang.org/genproto v0.0.0-20220531173845-685668d2de03 // indirect + github.com/stretchr/objx v0.5.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index c2bf7fe..c6251e0 100644 --- a/go.sum +++ b/go.sum @@ -37,6 +37,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -54,10 +56,15 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -76,6 +83,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20220531201128-c960675eff93 h1:MYimHLfoXEpOhqd/zgoA/uoXzHB86AEky4LAx5ij9xA= golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -93,17 +102,22 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -115,6 +129,8 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20220531173845-685668d2de03 h1:FG2YhwyltdDPC/0XuwzU0dijPcTzvfTtst0QdlDxoMU= google.golang.org/genproto v0.0.0-20220531173845-685668d2de03/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -124,6 +140,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= +google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -138,6 +156,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/pkg/apis/v1/cluster.pb.go b/pkg/apis/v1/cluster.pb.go index 4d2624c..b3ce214 100644 --- a/pkg/apis/v1/cluster.pb.go +++ b/pkg/apis/v1/cluster.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/cluster.proto diff --git a/pkg/apis/v1/cluster_grpc.pb.go b/pkg/apis/v1/cluster_grpc.pb.go index 0291306..fd72ed2 100644 --- a/pkg/apis/v1/cluster_grpc.pb.go +++ b/pkg/apis/v1/cluster_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/cluster.proto package v1 @@ -14,6 +18,13 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ClusterService_Added_FullMethodName = "/metalstack.io.accounting.api.v1.ClusterService/Added" + ClusterService_Modified_FullMethodName = "/metalstack.io.accounting.api.v1.ClusterService/Modified" + ClusterService_Deleted_FullMethodName = "/metalstack.io.accounting.api.v1.ClusterService/Deleted" + ClusterService_Usage_FullMethodName = "/metalstack.io.accounting.api.v1.ClusterService/Usage" +) + // ClusterServiceClient is the client API for ClusterService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -34,7 +45,7 @@ func NewClusterServiceClient(cc grpc.ClientConnInterface) ClusterServiceClient { func (c *clusterServiceClient) Added(ctx context.Context, in *ClusterReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.ClusterService/Added", in, out, opts...) + err := c.cc.Invoke(ctx, ClusterService_Added_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -43,7 +54,7 @@ func (c *clusterServiceClient) Added(ctx context.Context, in *ClusterReport, opt func (c *clusterServiceClient) Modified(ctx context.Context, in *ClusterReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.ClusterService/Modified", in, out, opts...) + err := c.cc.Invoke(ctx, ClusterService_Modified_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -52,7 +63,7 @@ func (c *clusterServiceClient) Modified(ctx context.Context, in *ClusterReport, func (c *clusterServiceClient) Deleted(ctx context.Context, in *ClusterReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.ClusterService/Deleted", in, out, opts...) + err := c.cc.Invoke(ctx, ClusterService_Deleted_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -61,7 +72,7 @@ func (c *clusterServiceClient) Deleted(ctx context.Context, in *ClusterReport, o func (c *clusterServiceClient) Usage(ctx context.Context, in *ClusterUsageRequest, opts ...grpc.CallOption) (*ClusterUsageResponse, error) { out := new(ClusterUsageResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.ClusterService/Usage", in, out, opts...) + err := c.cc.Invoke(ctx, ClusterService_Usage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +127,7 @@ func _ClusterService_Added_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.ClusterService/Added", + FullMethod: ClusterService_Added_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ClusterServiceServer).Added(ctx, req.(*ClusterReport)) @@ -134,7 +145,7 @@ func _ClusterService_Modified_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.ClusterService/Modified", + FullMethod: ClusterService_Modified_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ClusterServiceServer).Modified(ctx, req.(*ClusterReport)) @@ -152,7 +163,7 @@ func _ClusterService_Deleted_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.ClusterService/Deleted", + FullMethod: ClusterService_Deleted_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ClusterServiceServer).Deleted(ctx, req.(*ClusterReport)) @@ -170,7 +181,7 @@ func _ClusterService_Usage_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.ClusterService/Usage", + FullMethod: ClusterService_Usage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ClusterServiceServer).Usage(ctx, req.(*ClusterUsageRequest)) diff --git a/pkg/apis/v1/common.pb.go b/pkg/apis/v1/common.pb.go index 2fda0f8..0e008e7 100644 --- a/pkg/apis/v1/common.pb.go +++ b/pkg/apis/v1/common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/common.proto diff --git a/pkg/apis/v1/info.pb.go b/pkg/apis/v1/info.pb.go index 1c8b93e..7de3c09 100644 --- a/pkg/apis/v1/info.pb.go +++ b/pkg/apis/v1/info.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/info.proto diff --git a/pkg/apis/v1/info_grpc.pb.go b/pkg/apis/v1/info_grpc.pb.go index 0b1582b..ef68ede 100644 --- a/pkg/apis/v1/info_grpc.pb.go +++ b/pkg/apis/v1/info_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/info.proto package v1 @@ -14,6 +18,11 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + InfoService_Projects_FullMethodName = "/metalstack.io.accounting.api.v1.InfoService/Projects" + InfoService_Tenants_FullMethodName = "/metalstack.io.accounting.api.v1.InfoService/Tenants" +) + // InfoServiceClient is the client API for InfoService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -32,7 +41,7 @@ func NewInfoServiceClient(cc grpc.ClientConnInterface) InfoServiceClient { func (c *infoServiceClient) Projects(ctx context.Context, in *ProjectInfoRequest, opts ...grpc.CallOption) (*ProjectInfoResponse, error) { out := new(ProjectInfoResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.InfoService/Projects", in, out, opts...) + err := c.cc.Invoke(ctx, InfoService_Projects_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -41,7 +50,7 @@ func (c *infoServiceClient) Projects(ctx context.Context, in *ProjectInfoRequest func (c *infoServiceClient) Tenants(ctx context.Context, in *TenantInfoRequest, opts ...grpc.CallOption) (*TenantInfoResponse, error) { out := new(TenantInfoResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.InfoService/Tenants", in, out, opts...) + err := c.cc.Invoke(ctx, InfoService_Tenants_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -88,7 +97,7 @@ func _InfoService_Projects_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.InfoService/Projects", + FullMethod: InfoService_Projects_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(InfoServiceServer).Projects(ctx, req.(*ProjectInfoRequest)) @@ -106,7 +115,7 @@ func _InfoService_Tenants_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.InfoService/Tenants", + FullMethod: InfoService_Tenants_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(InfoServiceServer).Tenants(ctx, req.(*TenantInfoRequest)) diff --git a/pkg/apis/v1/ip.pb.go b/pkg/apis/v1/ip.pb.go index db9b72f..d9a1f01 100644 --- a/pkg/apis/v1/ip.pb.go +++ b/pkg/apis/v1/ip.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/ip.proto diff --git a/pkg/apis/v1/ip_grpc.pb.go b/pkg/apis/v1/ip_grpc.pb.go index 4290210..3d73f9b 100644 --- a/pkg/apis/v1/ip_grpc.pb.go +++ b/pkg/apis/v1/ip_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/ip.proto package v1 @@ -14,6 +18,13 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + IPService_Added_FullMethodName = "/metalstack.io.accounting.api.v1.IPService/Added" + IPService_Modified_FullMethodName = "/metalstack.io.accounting.api.v1.IPService/Modified" + IPService_Deleted_FullMethodName = "/metalstack.io.accounting.api.v1.IPService/Deleted" + IPService_Usage_FullMethodName = "/metalstack.io.accounting.api.v1.IPService/Usage" +) + // IPServiceClient is the client API for IPService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -34,7 +45,7 @@ func NewIPServiceClient(cc grpc.ClientConnInterface) IPServiceClient { func (c *iPServiceClient) Added(ctx context.Context, in *IPReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.IPService/Added", in, out, opts...) + err := c.cc.Invoke(ctx, IPService_Added_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -43,7 +54,7 @@ func (c *iPServiceClient) Added(ctx context.Context, in *IPReport, opts ...grpc. func (c *iPServiceClient) Modified(ctx context.Context, in *IPReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.IPService/Modified", in, out, opts...) + err := c.cc.Invoke(ctx, IPService_Modified_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -52,7 +63,7 @@ func (c *iPServiceClient) Modified(ctx context.Context, in *IPReport, opts ...gr func (c *iPServiceClient) Deleted(ctx context.Context, in *IPReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.IPService/Deleted", in, out, opts...) + err := c.cc.Invoke(ctx, IPService_Deleted_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -61,7 +72,7 @@ func (c *iPServiceClient) Deleted(ctx context.Context, in *IPReport, opts ...grp func (c *iPServiceClient) Usage(ctx context.Context, in *IPUsageRequest, opts ...grpc.CallOption) (*IPUsageResponse, error) { out := new(IPUsageResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.IPService/Usage", in, out, opts...) + err := c.cc.Invoke(ctx, IPService_Usage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +127,7 @@ func _IPService_Added_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.IPService/Added", + FullMethod: IPService_Added_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IPServiceServer).Added(ctx, req.(*IPReport)) @@ -134,7 +145,7 @@ func _IPService_Modified_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.IPService/Modified", + FullMethod: IPService_Modified_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IPServiceServer).Modified(ctx, req.(*IPReport)) @@ -152,7 +163,7 @@ func _IPService_Deleted_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.IPService/Deleted", + FullMethod: IPService_Deleted_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IPServiceServer).Deleted(ctx, req.(*IPReport)) @@ -170,7 +181,7 @@ func _IPService_Usage_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.IPService/Usage", + FullMethod: IPService_Usage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IPServiceServer).Usage(ctx, req.(*IPUsageRequest)) diff --git a/pkg/apis/v1/network_traffic.pb.go b/pkg/apis/v1/network_traffic.pb.go index 4b0113b..ef7ec58 100644 --- a/pkg/apis/v1/network_traffic.pb.go +++ b/pkg/apis/v1/network_traffic.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/network_traffic.proto @@ -31,7 +31,7 @@ type NetworkTraffic struct { Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"` In uint64 `protobuf:"varint,2,opt,name=in,proto3" json:"in,omitempty"` Out uint64 `protobuf:"varint,3,opt,name=out,proto3" json:"out,omitempty"` - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in metalstack/io/accounting/api/v1/network_traffic.proto. Total uint64 `protobuf:"varint,4,opt,name=total,proto3" json:"total,omitempty"` } @@ -88,7 +88,7 @@ func (x *NetworkTraffic) GetOut() uint64 { return 0 } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in metalstack/io/accounting/api/v1/network_traffic.proto. func (x *NetworkTraffic) GetTotal() uint64 { if x != nil { return x.Total diff --git a/pkg/apis/v1/network_traffic_grpc.pb.go b/pkg/apis/v1/network_traffic_grpc.pb.go index 35b5221..16a9549 100644 --- a/pkg/apis/v1/network_traffic_grpc.pb.go +++ b/pkg/apis/v1/network_traffic_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/network_traffic.proto package v1 @@ -14,6 +18,11 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + NetworkTrafficService_Modified_FullMethodName = "/metalstack.io.accounting.api.v1.NetworkTrafficService/Modified" + NetworkTrafficService_Usage_FullMethodName = "/metalstack.io.accounting.api.v1.NetworkTrafficService/Usage" +) + // NetworkTrafficServiceClient is the client API for NetworkTrafficService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -32,7 +41,7 @@ func NewNetworkTrafficServiceClient(cc grpc.ClientConnInterface) NetworkTrafficS func (c *networkTrafficServiceClient) Modified(ctx context.Context, in *NetworkTrafficReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.NetworkTrafficService/Modified", in, out, opts...) + err := c.cc.Invoke(ctx, NetworkTrafficService_Modified_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -41,7 +50,7 @@ func (c *networkTrafficServiceClient) Modified(ctx context.Context, in *NetworkT func (c *networkTrafficServiceClient) Usage(ctx context.Context, in *NetworkUsageRequest, opts ...grpc.CallOption) (*NetworkUsageResponse, error) { out := new(NetworkUsageResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.NetworkTrafficService/Usage", in, out, opts...) + err := c.cc.Invoke(ctx, NetworkTrafficService_Usage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -88,7 +97,7 @@ func _NetworkTrafficService_Modified_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.NetworkTrafficService/Modified", + FullMethod: NetworkTrafficService_Modified_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(NetworkTrafficServiceServer).Modified(ctx, req.(*NetworkTrafficReport)) @@ -106,7 +115,7 @@ func _NetworkTrafficService_Usage_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.NetworkTrafficService/Usage", + FullMethod: NetworkTrafficService_Usage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(NetworkTrafficServiceServer).Usage(ctx, req.(*NetworkUsageRequest)) diff --git a/pkg/apis/v1/pod.pb.go b/pkg/apis/v1/pod.pb.go index 3dba026..e9ee72e 100644 --- a/pkg/apis/v1/pod.pb.go +++ b/pkg/apis/v1/pod.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/pod.proto diff --git a/pkg/apis/v1/pod_grpc.pb.go b/pkg/apis/v1/pod_grpc.pb.go index eeee4a0..f0013e1 100644 --- a/pkg/apis/v1/pod_grpc.pb.go +++ b/pkg/apis/v1/pod_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/pod.proto package v1 @@ -14,6 +18,13 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + PodService_Added_FullMethodName = "/metalstack.io.accounting.api.v1.PodService/Added" + PodService_Modified_FullMethodName = "/metalstack.io.accounting.api.v1.PodService/Modified" + PodService_Deleted_FullMethodName = "/metalstack.io.accounting.api.v1.PodService/Deleted" + PodService_Usage_FullMethodName = "/metalstack.io.accounting.api.v1.PodService/Usage" +) + // PodServiceClient is the client API for PodService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -34,7 +45,7 @@ func NewPodServiceClient(cc grpc.ClientConnInterface) PodServiceClient { func (c *podServiceClient) Added(ctx context.Context, in *PodReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PodService/Added", in, out, opts...) + err := c.cc.Invoke(ctx, PodService_Added_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -43,7 +54,7 @@ func (c *podServiceClient) Added(ctx context.Context, in *PodReport, opts ...grp func (c *podServiceClient) Modified(ctx context.Context, in *PodReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PodService/Modified", in, out, opts...) + err := c.cc.Invoke(ctx, PodService_Modified_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -52,7 +63,7 @@ func (c *podServiceClient) Modified(ctx context.Context, in *PodReport, opts ... func (c *podServiceClient) Deleted(ctx context.Context, in *PodReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PodService/Deleted", in, out, opts...) + err := c.cc.Invoke(ctx, PodService_Deleted_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -61,7 +72,7 @@ func (c *podServiceClient) Deleted(ctx context.Context, in *PodReport, opts ...g func (c *podServiceClient) Usage(ctx context.Context, in *ContainerUsageRequest, opts ...grpc.CallOption) (*ContainerUsageResponse, error) { out := new(ContainerUsageResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PodService/Usage", in, out, opts...) + err := c.cc.Invoke(ctx, PodService_Usage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +127,7 @@ func _PodService_Added_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PodService/Added", + FullMethod: PodService_Added_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PodServiceServer).Added(ctx, req.(*PodReport)) @@ -134,7 +145,7 @@ func _PodService_Modified_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PodService/Modified", + FullMethod: PodService_Modified_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PodServiceServer).Modified(ctx, req.(*PodReport)) @@ -152,7 +163,7 @@ func _PodService_Deleted_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PodService/Deleted", + FullMethod: PodService_Deleted_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PodServiceServer).Deleted(ctx, req.(*PodReport)) @@ -170,7 +181,7 @@ func _PodService_Usage_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PodService/Usage", + FullMethod: PodService_Usage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PodServiceServer).Usage(ctx, req.(*ContainerUsageRequest)) diff --git a/pkg/apis/v1/postgres.pb.go b/pkg/apis/v1/postgres.pb.go index 95cbd0e..7f1540f 100644 --- a/pkg/apis/v1/postgres.pb.go +++ b/pkg/apis/v1/postgres.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/postgres.proto diff --git a/pkg/apis/v1/postgres_grpc.pb.go b/pkg/apis/v1/postgres_grpc.pb.go index 137569f..5597429 100644 --- a/pkg/apis/v1/postgres_grpc.pb.go +++ b/pkg/apis/v1/postgres_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/postgres.proto package v1 @@ -14,6 +18,13 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + PostgresService_Added_FullMethodName = "/metalstack.io.accounting.api.v1.PostgresService/Added" + PostgresService_Modified_FullMethodName = "/metalstack.io.accounting.api.v1.PostgresService/Modified" + PostgresService_Deleted_FullMethodName = "/metalstack.io.accounting.api.v1.PostgresService/Deleted" + PostgresService_Usage_FullMethodName = "/metalstack.io.accounting.api.v1.PostgresService/Usage" +) + // PostgresServiceClient is the client API for PostgresService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -34,7 +45,7 @@ func NewPostgresServiceClient(cc grpc.ClientConnInterface) PostgresServiceClient func (c *postgresServiceClient) Added(ctx context.Context, in *PostgresReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PostgresService/Added", in, out, opts...) + err := c.cc.Invoke(ctx, PostgresService_Added_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -43,7 +54,7 @@ func (c *postgresServiceClient) Added(ctx context.Context, in *PostgresReport, o func (c *postgresServiceClient) Modified(ctx context.Context, in *PostgresReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PostgresService/Modified", in, out, opts...) + err := c.cc.Invoke(ctx, PostgresService_Modified_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -52,7 +63,7 @@ func (c *postgresServiceClient) Modified(ctx context.Context, in *PostgresReport func (c *postgresServiceClient) Deleted(ctx context.Context, in *PostgresReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PostgresService/Deleted", in, out, opts...) + err := c.cc.Invoke(ctx, PostgresService_Deleted_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -61,7 +72,7 @@ func (c *postgresServiceClient) Deleted(ctx context.Context, in *PostgresReport, func (c *postgresServiceClient) Usage(ctx context.Context, in *PostgresUsageRequest, opts ...grpc.CallOption) (*PostgresUsageResponse, error) { out := new(PostgresUsageResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.PostgresService/Usage", in, out, opts...) + err := c.cc.Invoke(ctx, PostgresService_Usage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +127,7 @@ func _PostgresService_Added_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PostgresService/Added", + FullMethod: PostgresService_Added_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PostgresServiceServer).Added(ctx, req.(*PostgresReport)) @@ -134,7 +145,7 @@ func _PostgresService_Modified_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PostgresService/Modified", + FullMethod: PostgresService_Modified_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PostgresServiceServer).Modified(ctx, req.(*PostgresReport)) @@ -152,7 +163,7 @@ func _PostgresService_Deleted_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PostgresService/Deleted", + FullMethod: PostgresService_Deleted_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PostgresServiceServer).Deleted(ctx, req.(*PostgresReport)) @@ -170,7 +181,7 @@ func _PostgresService_Usage_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.PostgresService/Usage", + FullMethod: PostgresService_Usage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PostgresServiceServer).Usage(ctx, req.(*PostgresUsageRequest)) diff --git a/pkg/apis/v1/s3.pb.go b/pkg/apis/v1/s3.pb.go index 95df838..8b260b6 100644 --- a/pkg/apis/v1/s3.pb.go +++ b/pkg/apis/v1/s3.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/s3.proto diff --git a/pkg/apis/v1/s3_grpc.pb.go b/pkg/apis/v1/s3_grpc.pb.go index 19781de..ad1635a 100644 --- a/pkg/apis/v1/s3_grpc.pb.go +++ b/pkg/apis/v1/s3_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/s3.proto package v1 @@ -14,6 +18,11 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + S3Service_BucketStats_FullMethodName = "/metalstack.io.accounting.api.v1.S3Service/BucketStats" + S3Service_Usage_FullMethodName = "/metalstack.io.accounting.api.v1.S3Service/Usage" +) + // S3ServiceClient is the client API for S3Service service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -32,7 +41,7 @@ func NewS3ServiceClient(cc grpc.ClientConnInterface) S3ServiceClient { func (c *s3ServiceClient) BucketStats(ctx context.Context, in *S3BucketReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.S3Service/BucketStats", in, out, opts...) + err := c.cc.Invoke(ctx, S3Service_BucketStats_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -41,7 +50,7 @@ func (c *s3ServiceClient) BucketStats(ctx context.Context, in *S3BucketReport, o func (c *s3ServiceClient) Usage(ctx context.Context, in *S3UsageRequest, opts ...grpc.CallOption) (*S3UsageResponse, error) { out := new(S3UsageResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.S3Service/Usage", in, out, opts...) + err := c.cc.Invoke(ctx, S3Service_Usage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -88,7 +97,7 @@ func _S3Service_BucketStats_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.S3Service/BucketStats", + FullMethod: S3Service_BucketStats_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(S3ServiceServer).BucketStats(ctx, req.(*S3BucketReport)) @@ -106,7 +115,7 @@ func _S3Service_Usage_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.S3Service/Usage", + FullMethod: S3Service_Usage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(S3ServiceServer).Usage(ctx, req.(*S3UsageRequest)) diff --git a/pkg/apis/v1/volume.pb.go b/pkg/apis/v1/volume.pb.go index abb5db9..d0da886 100644 --- a/pkg/apis/v1/volume.pb.go +++ b/pkg/apis/v1/volume.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: metalstack/io/accounting/api/v1/volume.proto diff --git a/pkg/apis/v1/volume_grpc.pb.go b/pkg/apis/v1/volume_grpc.pb.go index 41363ef..c8d4723 100644 --- a/pkg/apis/v1/volume_grpc.pb.go +++ b/pkg/apis/v1/volume_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: metalstack/io/accounting/api/v1/volume.proto package v1 @@ -14,6 +18,13 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + VolumeService_Added_FullMethodName = "/metalstack.io.accounting.api.v1.VolumeService/Added" + VolumeService_Modified_FullMethodName = "/metalstack.io.accounting.api.v1.VolumeService/Modified" + VolumeService_Deleted_FullMethodName = "/metalstack.io.accounting.api.v1.VolumeService/Deleted" + VolumeService_Usage_FullMethodName = "/metalstack.io.accounting.api.v1.VolumeService/Usage" +) + // VolumeServiceClient is the client API for VolumeService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -34,7 +45,7 @@ func NewVolumeServiceClient(cc grpc.ClientConnInterface) VolumeServiceClient { func (c *volumeServiceClient) Added(ctx context.Context, in *VolumeReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.VolumeService/Added", in, out, opts...) + err := c.cc.Invoke(ctx, VolumeService_Added_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -43,7 +54,7 @@ func (c *volumeServiceClient) Added(ctx context.Context, in *VolumeReport, opts func (c *volumeServiceClient) Modified(ctx context.Context, in *VolumeReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.VolumeService/Modified", in, out, opts...) + err := c.cc.Invoke(ctx, VolumeService_Modified_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -52,7 +63,7 @@ func (c *volumeServiceClient) Modified(ctx context.Context, in *VolumeReport, op func (c *volumeServiceClient) Deleted(ctx context.Context, in *VolumeReport, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.VolumeService/Deleted", in, out, opts...) + err := c.cc.Invoke(ctx, VolumeService_Deleted_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -61,7 +72,7 @@ func (c *volumeServiceClient) Deleted(ctx context.Context, in *VolumeReport, opt func (c *volumeServiceClient) Usage(ctx context.Context, in *VolumeUsageRequest, opts ...grpc.CallOption) (*VolumeUsageResponse, error) { out := new(VolumeUsageResponse) - err := c.cc.Invoke(ctx, "/metalstack.io.accounting.api.v1.VolumeService/Usage", in, out, opts...) + err := c.cc.Invoke(ctx, VolumeService_Usage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +127,7 @@ func _VolumeService_Added_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.VolumeService/Added", + FullMethod: VolumeService_Added_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(VolumeServiceServer).Added(ctx, req.(*VolumeReport)) @@ -134,7 +145,7 @@ func _VolumeService_Modified_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.VolumeService/Modified", + FullMethod: VolumeService_Modified_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(VolumeServiceServer).Modified(ctx, req.(*VolumeReport)) @@ -152,7 +163,7 @@ func _VolumeService_Deleted_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.VolumeService/Deleted", + FullMethod: VolumeService_Deleted_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(VolumeServiceServer).Deleted(ctx, req.(*VolumeReport)) @@ -170,7 +181,7 @@ func _VolumeService_Usage_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/metalstack.io.accounting.api.v1.VolumeService/Usage", + FullMethod: VolumeService_Usage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(VolumeServiceServer).Usage(ctx, req.(*VolumeUsageRequest)) diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml index f952fe9..efd669d 100644 --- a/proto/buf.gen.yaml +++ b/proto/buf.gen.yaml @@ -1,10 +1,10 @@ version: v1 plugins: - # generate go structs for protocol buffer defination - - remote: buf.build/library/plugins/go:v1.27.1-1 + # generate go structs for protocol buffer definition + - plugin: buf.build/protocolbuffers/go:v1.29.1 out: ../ # generate gRPC stubs in golang - - remote: buf.build/library/plugins/go-grpc:v1.1.0-2 + - plugin: buf.build/grpc/go:v1.3.0 out: ../ opt: - require_unimplemented_servers=false diff --git a/test/mocks/v1/ClusterServiceClient.go b/test/mocks/v1/ClusterServiceClient.go index 695706c..e446f27 100644 --- a/test/mocks/v1/ClusterServiceClient.go +++ b/test/mocks/v1/ClusterServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *ClusterServiceClient) Added(ctx context.Context, in *v1.ClusterReport, ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *ClusterServiceClient) Added(ctx context.Context, in *v1.ClusterReport, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *ClusterServiceClient) Deleted(ctx context.Context, in *v1.ClusterRepor ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *ClusterServiceClient) Deleted(ctx context.Context, in *v1.ClusterRepor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -89,6 +95,10 @@ func (_m *ClusterServiceClient) Modified(ctx context.Context, in *v1.ClusterRepo ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -97,7 +107,6 @@ func (_m *ClusterServiceClient) Modified(ctx context.Context, in *v1.ClusterRepo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -119,6 +128,10 @@ func (_m *ClusterServiceClient) Usage(ctx context.Context, in *v1.ClusterUsageRe ret := _m.Called(_ca...) var r0 *v1.ClusterUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterUsageRequest, ...grpc.CallOption) (*v1.ClusterUsageResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterUsageRequest, ...grpc.CallOption) *v1.ClusterUsageResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -127,7 +140,6 @@ func (_m *ClusterServiceClient) Usage(ctx context.Context, in *v1.ClusterUsageRe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterUsageRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -137,13 +149,13 @@ func (_m *ClusterServiceClient) Usage(ctx context.Context, in *v1.ClusterUsageRe return r0, r1 } -type NewClusterServiceClientT interface { +type mockConstructorTestingTNewClusterServiceClient interface { mock.TestingT Cleanup(func()) } // NewClusterServiceClient creates a new instance of ClusterServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewClusterServiceClient(t NewClusterServiceClientT) *ClusterServiceClient { +func NewClusterServiceClient(t mockConstructorTestingTNewClusterServiceClient) *ClusterServiceClient { mock := &ClusterServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/ClusterServiceServer.go b/test/mocks/v1/ClusterServiceServer.go index 0574e44..8d5755b 100644 --- a/test/mocks/v1/ClusterServiceServer.go +++ b/test/mocks/v1/ClusterServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *ClusterServiceServer) Added(_a0 context.Context, _a1 *v1.ClusterReport ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *ClusterServiceServer) Added(_a0 context.Context, _a1 *v1.ClusterReport } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *ClusterServiceServer) Deleted(_a0 context.Context, _a1 *v1.ClusterRepo ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *ClusterServiceServer) Deleted(_a0 context.Context, _a1 *v1.ClusterRepo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -65,6 +71,10 @@ func (_m *ClusterServiceServer) Modified(_a0 context.Context, _a1 *v1.ClusterRep ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +83,6 @@ func (_m *ClusterServiceServer) Modified(_a0 context.Context, _a1 *v1.ClusterRep } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -88,6 +97,10 @@ func (_m *ClusterServiceServer) Usage(_a0 context.Context, _a1 *v1.ClusterUsageR ret := _m.Called(_a0, _a1) var r0 *v1.ClusterUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterUsageRequest) (*v1.ClusterUsageResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ClusterUsageRequest) *v1.ClusterUsageResponse); ok { r0 = rf(_a0, _a1) } else { @@ -96,7 +109,6 @@ func (_m *ClusterServiceServer) Usage(_a0 context.Context, _a1 *v1.ClusterUsageR } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ClusterUsageRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -106,13 +118,13 @@ func (_m *ClusterServiceServer) Usage(_a0 context.Context, _a1 *v1.ClusterUsageR return r0, r1 } -type NewClusterServiceServerT interface { +type mockConstructorTestingTNewClusterServiceServer interface { mock.TestingT Cleanup(func()) } // NewClusterServiceServer creates a new instance of ClusterServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewClusterServiceServer(t NewClusterServiceServerT) *ClusterServiceServer { +func NewClusterServiceServer(t mockConstructorTestingTNewClusterServiceServer) *ClusterServiceServer { mock := &ClusterServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/IPServiceClient.go b/test/mocks/v1/IPServiceClient.go index 9bb2700..bcc3fcf 100644 --- a/test/mocks/v1/IPServiceClient.go +++ b/test/mocks/v1/IPServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *IPServiceClient) Added(ctx context.Context, in *v1.IPReport, opts ...g ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *IPServiceClient) Added(ctx context.Context, in *v1.IPReport, opts ...g } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *IPServiceClient) Deleted(ctx context.Context, in *v1.IPReport, opts .. ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *IPServiceClient) Deleted(ctx context.Context, in *v1.IPReport, opts .. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -89,6 +95,10 @@ func (_m *IPServiceClient) Modified(ctx context.Context, in *v1.IPReport, opts . ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -97,7 +107,6 @@ func (_m *IPServiceClient) Modified(ctx context.Context, in *v1.IPReport, opts . } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -119,6 +128,10 @@ func (_m *IPServiceClient) Usage(ctx context.Context, in *v1.IPUsageRequest, opt ret := _m.Called(_ca...) var r0 *v1.IPUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPUsageRequest, ...grpc.CallOption) (*v1.IPUsageResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPUsageRequest, ...grpc.CallOption) *v1.IPUsageResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -127,7 +140,6 @@ func (_m *IPServiceClient) Usage(ctx context.Context, in *v1.IPUsageRequest, opt } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPUsageRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -137,13 +149,13 @@ func (_m *IPServiceClient) Usage(ctx context.Context, in *v1.IPUsageRequest, opt return r0, r1 } -type NewIPServiceClientT interface { +type mockConstructorTestingTNewIPServiceClient interface { mock.TestingT Cleanup(func()) } // NewIPServiceClient creates a new instance of IPServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewIPServiceClient(t NewIPServiceClientT) *IPServiceClient { +func NewIPServiceClient(t mockConstructorTestingTNewIPServiceClient) *IPServiceClient { mock := &IPServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/IPServiceServer.go b/test/mocks/v1/IPServiceServer.go index 5341fa4..491669e 100644 --- a/test/mocks/v1/IPServiceServer.go +++ b/test/mocks/v1/IPServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *IPServiceServer) Added(_a0 context.Context, _a1 *v1.IPReport) (*v1.Emp ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *IPServiceServer) Added(_a0 context.Context, _a1 *v1.IPReport) (*v1.Emp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *IPServiceServer) Deleted(_a0 context.Context, _a1 *v1.IPReport) (*v1.E ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *IPServiceServer) Deleted(_a0 context.Context, _a1 *v1.IPReport) (*v1.E } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -65,6 +71,10 @@ func (_m *IPServiceServer) Modified(_a0 context.Context, _a1 *v1.IPReport) (*v1. ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +83,6 @@ func (_m *IPServiceServer) Modified(_a0 context.Context, _a1 *v1.IPReport) (*v1. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -88,6 +97,10 @@ func (_m *IPServiceServer) Usage(_a0 context.Context, _a1 *v1.IPUsageRequest) (* ret := _m.Called(_a0, _a1) var r0 *v1.IPUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.IPUsageRequest) (*v1.IPUsageResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.IPUsageRequest) *v1.IPUsageResponse); ok { r0 = rf(_a0, _a1) } else { @@ -96,7 +109,6 @@ func (_m *IPServiceServer) Usage(_a0 context.Context, _a1 *v1.IPUsageRequest) (* } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.IPUsageRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -106,13 +118,13 @@ func (_m *IPServiceServer) Usage(_a0 context.Context, _a1 *v1.IPUsageRequest) (* return r0, r1 } -type NewIPServiceServerT interface { +type mockConstructorTestingTNewIPServiceServer interface { mock.TestingT Cleanup(func()) } // NewIPServiceServer creates a new instance of IPServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewIPServiceServer(t NewIPServiceServerT) *IPServiceServer { +func NewIPServiceServer(t mockConstructorTestingTNewIPServiceServer) *IPServiceServer { mock := &IPServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/InfoServiceClient.go b/test/mocks/v1/InfoServiceClient.go index 78e1b52..b6d1344 100644 --- a/test/mocks/v1/InfoServiceClient.go +++ b/test/mocks/v1/InfoServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *InfoServiceClient) Projects(ctx context.Context, in *v1.ProjectInfoReq ret := _m.Called(_ca...) var r0 *v1.ProjectInfoResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ProjectInfoRequest, ...grpc.CallOption) (*v1.ProjectInfoResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ProjectInfoRequest, ...grpc.CallOption) *v1.ProjectInfoResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *InfoServiceClient) Projects(ctx context.Context, in *v1.ProjectInfoReq } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ProjectInfoRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *InfoServiceClient) Tenants(ctx context.Context, in *v1.TenantInfoReque ret := _m.Called(_ca...) var r0 *v1.TenantInfoResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.TenantInfoRequest, ...grpc.CallOption) (*v1.TenantInfoResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.TenantInfoRequest, ...grpc.CallOption) *v1.TenantInfoResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *InfoServiceClient) Tenants(ctx context.Context, in *v1.TenantInfoReque } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.TenantInfoRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -77,13 +83,13 @@ func (_m *InfoServiceClient) Tenants(ctx context.Context, in *v1.TenantInfoReque return r0, r1 } -type NewInfoServiceClientT interface { +type mockConstructorTestingTNewInfoServiceClient interface { mock.TestingT Cleanup(func()) } // NewInfoServiceClient creates a new instance of InfoServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewInfoServiceClient(t NewInfoServiceClientT) *InfoServiceClient { +func NewInfoServiceClient(t mockConstructorTestingTNewInfoServiceClient) *InfoServiceClient { mock := &InfoServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/InfoServiceServer.go b/test/mocks/v1/InfoServiceServer.go index f70103b..605b4bf 100644 --- a/test/mocks/v1/InfoServiceServer.go +++ b/test/mocks/v1/InfoServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *InfoServiceServer) Projects(_a0 context.Context, _a1 *v1.ProjectInfoRe ret := _m.Called(_a0, _a1) var r0 *v1.ProjectInfoResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ProjectInfoRequest) (*v1.ProjectInfoResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ProjectInfoRequest) *v1.ProjectInfoResponse); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *InfoServiceServer) Projects(_a0 context.Context, _a1 *v1.ProjectInfoRe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ProjectInfoRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *InfoServiceServer) Tenants(_a0 context.Context, _a1 *v1.TenantInfoRequ ret := _m.Called(_a0, _a1) var r0 *v1.TenantInfoResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.TenantInfoRequest) (*v1.TenantInfoResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.TenantInfoRequest) *v1.TenantInfoResponse); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *InfoServiceServer) Tenants(_a0 context.Context, _a1 *v1.TenantInfoRequ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.TenantInfoRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -60,13 +66,13 @@ func (_m *InfoServiceServer) Tenants(_a0 context.Context, _a1 *v1.TenantInfoRequ return r0, r1 } -type NewInfoServiceServerT interface { +type mockConstructorTestingTNewInfoServiceServer interface { mock.TestingT Cleanup(func()) } // NewInfoServiceServer creates a new instance of InfoServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewInfoServiceServer(t NewInfoServiceServerT) *InfoServiceServer { +func NewInfoServiceServer(t mockConstructorTestingTNewInfoServiceServer) *InfoServiceServer { mock := &InfoServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/NetworkTrafficServiceClient.go b/test/mocks/v1/NetworkTrafficServiceClient.go index f58aade..f5e14de 100644 --- a/test/mocks/v1/NetworkTrafficServiceClient.go +++ b/test/mocks/v1/NetworkTrafficServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *NetworkTrafficServiceClient) Modified(ctx context.Context, in *v1.Netw ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkTrafficReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkTrafficReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *NetworkTrafficServiceClient) Modified(ctx context.Context, in *v1.Netw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.NetworkTrafficReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *NetworkTrafficServiceClient) Usage(ctx context.Context, in *v1.Network ret := _m.Called(_ca...) var r0 *v1.NetworkUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkUsageRequest, ...grpc.CallOption) (*v1.NetworkUsageResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkUsageRequest, ...grpc.CallOption) *v1.NetworkUsageResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *NetworkTrafficServiceClient) Usage(ctx context.Context, in *v1.Network } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.NetworkUsageRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -77,13 +83,13 @@ func (_m *NetworkTrafficServiceClient) Usage(ctx context.Context, in *v1.Network return r0, r1 } -type NewNetworkTrafficServiceClientT interface { +type mockConstructorTestingTNewNetworkTrafficServiceClient interface { mock.TestingT Cleanup(func()) } // NewNetworkTrafficServiceClient creates a new instance of NetworkTrafficServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewNetworkTrafficServiceClient(t NewNetworkTrafficServiceClientT) *NetworkTrafficServiceClient { +func NewNetworkTrafficServiceClient(t mockConstructorTestingTNewNetworkTrafficServiceClient) *NetworkTrafficServiceClient { mock := &NetworkTrafficServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/NetworkTrafficServiceServer.go b/test/mocks/v1/NetworkTrafficServiceServer.go index 9fdbf26..c47fe0e 100644 --- a/test/mocks/v1/NetworkTrafficServiceServer.go +++ b/test/mocks/v1/NetworkTrafficServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *NetworkTrafficServiceServer) Modified(_a0 context.Context, _a1 *v1.Net ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkTrafficReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkTrafficReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *NetworkTrafficServiceServer) Modified(_a0 context.Context, _a1 *v1.Net } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.NetworkTrafficReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *NetworkTrafficServiceServer) Usage(_a0 context.Context, _a1 *v1.Networ ret := _m.Called(_a0, _a1) var r0 *v1.NetworkUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkUsageRequest) (*v1.NetworkUsageResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.NetworkUsageRequest) *v1.NetworkUsageResponse); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *NetworkTrafficServiceServer) Usage(_a0 context.Context, _a1 *v1.Networ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.NetworkUsageRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -60,13 +66,13 @@ func (_m *NetworkTrafficServiceServer) Usage(_a0 context.Context, _a1 *v1.Networ return r0, r1 } -type NewNetworkTrafficServiceServerT interface { +type mockConstructorTestingTNewNetworkTrafficServiceServer interface { mock.TestingT Cleanup(func()) } // NewNetworkTrafficServiceServer creates a new instance of NetworkTrafficServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewNetworkTrafficServiceServer(t NewNetworkTrafficServiceServerT) *NetworkTrafficServiceServer { +func NewNetworkTrafficServiceServer(t mockConstructorTestingTNewNetworkTrafficServiceServer) *NetworkTrafficServiceServer { mock := &NetworkTrafficServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/PodServiceClient.go b/test/mocks/v1/PodServiceClient.go index 5e28f3e..4b3a85e 100644 --- a/test/mocks/v1/PodServiceClient.go +++ b/test/mocks/v1/PodServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *PodServiceClient) Added(ctx context.Context, in *v1.PodReport, opts .. ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *PodServiceClient) Added(ctx context.Context, in *v1.PodReport, opts .. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PodReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *PodServiceClient) Deleted(ctx context.Context, in *v1.PodReport, opts ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *PodServiceClient) Deleted(ctx context.Context, in *v1.PodReport, opts } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PodReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -89,6 +95,10 @@ func (_m *PodServiceClient) Modified(ctx context.Context, in *v1.PodReport, opts ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -97,7 +107,6 @@ func (_m *PodServiceClient) Modified(ctx context.Context, in *v1.PodReport, opts } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PodReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -119,6 +128,10 @@ func (_m *PodServiceClient) Usage(ctx context.Context, in *v1.ContainerUsageRequ ret := _m.Called(_ca...) var r0 *v1.ContainerUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ContainerUsageRequest, ...grpc.CallOption) (*v1.ContainerUsageResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ContainerUsageRequest, ...grpc.CallOption) *v1.ContainerUsageResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -127,7 +140,6 @@ func (_m *PodServiceClient) Usage(ctx context.Context, in *v1.ContainerUsageRequ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ContainerUsageRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -137,13 +149,13 @@ func (_m *PodServiceClient) Usage(ctx context.Context, in *v1.ContainerUsageRequ return r0, r1 } -type NewPodServiceClientT interface { +type mockConstructorTestingTNewPodServiceClient interface { mock.TestingT Cleanup(func()) } // NewPodServiceClient creates a new instance of PodServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewPodServiceClient(t NewPodServiceClientT) *PodServiceClient { +func NewPodServiceClient(t mockConstructorTestingTNewPodServiceClient) *PodServiceClient { mock := &PodServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/PodServiceServer.go b/test/mocks/v1/PodServiceServer.go index 7406835..b478aa8 100644 --- a/test/mocks/v1/PodServiceServer.go +++ b/test/mocks/v1/PodServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *PodServiceServer) Added(_a0 context.Context, _a1 *v1.PodReport) (*v1.E ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *PodServiceServer) Added(_a0 context.Context, _a1 *v1.PodReport) (*v1.E } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PodReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *PodServiceServer) Deleted(_a0 context.Context, _a1 *v1.PodReport) (*v1 ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *PodServiceServer) Deleted(_a0 context.Context, _a1 *v1.PodReport) (*v1 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PodReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -65,6 +71,10 @@ func (_m *PodServiceServer) Modified(_a0 context.Context, _a1 *v1.PodReport) (*v ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PodReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +83,6 @@ func (_m *PodServiceServer) Modified(_a0 context.Context, _a1 *v1.PodReport) (*v } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PodReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -88,6 +97,10 @@ func (_m *PodServiceServer) Usage(_a0 context.Context, _a1 *v1.ContainerUsageReq ret := _m.Called(_a0, _a1) var r0 *v1.ContainerUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.ContainerUsageRequest) (*v1.ContainerUsageResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.ContainerUsageRequest) *v1.ContainerUsageResponse); ok { r0 = rf(_a0, _a1) } else { @@ -96,7 +109,6 @@ func (_m *PodServiceServer) Usage(_a0 context.Context, _a1 *v1.ContainerUsageReq } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.ContainerUsageRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -106,13 +118,13 @@ func (_m *PodServiceServer) Usage(_a0 context.Context, _a1 *v1.ContainerUsageReq return r0, r1 } -type NewPodServiceServerT interface { +type mockConstructorTestingTNewPodServiceServer interface { mock.TestingT Cleanup(func()) } // NewPodServiceServer creates a new instance of PodServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewPodServiceServer(t NewPodServiceServerT) *PodServiceServer { +func NewPodServiceServer(t mockConstructorTestingTNewPodServiceServer) *PodServiceServer { mock := &PodServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/PostgresServiceClient.go b/test/mocks/v1/PostgresServiceClient.go index ada2e4b..169e4c1 100644 --- a/test/mocks/v1/PostgresServiceClient.go +++ b/test/mocks/v1/PostgresServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *PostgresServiceClient) Added(ctx context.Context, in *v1.PostgresRepor ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *PostgresServiceClient) Added(ctx context.Context, in *v1.PostgresRepor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *PostgresServiceClient) Deleted(ctx context.Context, in *v1.PostgresRep ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *PostgresServiceClient) Deleted(ctx context.Context, in *v1.PostgresRep } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -89,6 +95,10 @@ func (_m *PostgresServiceClient) Modified(ctx context.Context, in *v1.PostgresRe ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -97,7 +107,6 @@ func (_m *PostgresServiceClient) Modified(ctx context.Context, in *v1.PostgresRe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -119,6 +128,10 @@ func (_m *PostgresServiceClient) Usage(ctx context.Context, in *v1.PostgresUsage ret := _m.Called(_ca...) var r0 *v1.PostgresUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresUsageRequest, ...grpc.CallOption) (*v1.PostgresUsageResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresUsageRequest, ...grpc.CallOption) *v1.PostgresUsageResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -127,7 +140,6 @@ func (_m *PostgresServiceClient) Usage(ctx context.Context, in *v1.PostgresUsage } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresUsageRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -137,13 +149,13 @@ func (_m *PostgresServiceClient) Usage(ctx context.Context, in *v1.PostgresUsage return r0, r1 } -type NewPostgresServiceClientT interface { +type mockConstructorTestingTNewPostgresServiceClient interface { mock.TestingT Cleanup(func()) } // NewPostgresServiceClient creates a new instance of PostgresServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewPostgresServiceClient(t NewPostgresServiceClientT) *PostgresServiceClient { +func NewPostgresServiceClient(t mockConstructorTestingTNewPostgresServiceClient) *PostgresServiceClient { mock := &PostgresServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/PostgresServiceServer.go b/test/mocks/v1/PostgresServiceServer.go index 331a46e..244fb79 100644 --- a/test/mocks/v1/PostgresServiceServer.go +++ b/test/mocks/v1/PostgresServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *PostgresServiceServer) Added(_a0 context.Context, _a1 *v1.PostgresRepo ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *PostgresServiceServer) Added(_a0 context.Context, _a1 *v1.PostgresRepo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *PostgresServiceServer) Deleted(_a0 context.Context, _a1 *v1.PostgresRe ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *PostgresServiceServer) Deleted(_a0 context.Context, _a1 *v1.PostgresRe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -65,6 +71,10 @@ func (_m *PostgresServiceServer) Modified(_a0 context.Context, _a1 *v1.PostgresR ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +83,6 @@ func (_m *PostgresServiceServer) Modified(_a0 context.Context, _a1 *v1.PostgresR } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -88,6 +97,10 @@ func (_m *PostgresServiceServer) Usage(_a0 context.Context, _a1 *v1.PostgresUsag ret := _m.Called(_a0, _a1) var r0 *v1.PostgresUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresUsageRequest) (*v1.PostgresUsageResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.PostgresUsageRequest) *v1.PostgresUsageResponse); ok { r0 = rf(_a0, _a1) } else { @@ -96,7 +109,6 @@ func (_m *PostgresServiceServer) Usage(_a0 context.Context, _a1 *v1.PostgresUsag } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.PostgresUsageRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -106,13 +118,13 @@ func (_m *PostgresServiceServer) Usage(_a0 context.Context, _a1 *v1.PostgresUsag return r0, r1 } -type NewPostgresServiceServerT interface { +type mockConstructorTestingTNewPostgresServiceServer interface { mock.TestingT Cleanup(func()) } // NewPostgresServiceServer creates a new instance of PostgresServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewPostgresServiceServer(t NewPostgresServiceServerT) *PostgresServiceServer { +func NewPostgresServiceServer(t mockConstructorTestingTNewPostgresServiceServer) *PostgresServiceServer { mock := &PostgresServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/S3ServiceClient.go b/test/mocks/v1/S3ServiceClient.go index f58c2af..2d00c50 100644 --- a/test/mocks/v1/S3ServiceClient.go +++ b/test/mocks/v1/S3ServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *S3ServiceClient) BucketStats(ctx context.Context, in *v1.S3BucketRepor ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.S3BucketReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.S3BucketReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *S3ServiceClient) BucketStats(ctx context.Context, in *v1.S3BucketRepor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.S3BucketReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *S3ServiceClient) Usage(ctx context.Context, in *v1.S3UsageRequest, opt ret := _m.Called(_ca...) var r0 *v1.S3UsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.S3UsageRequest, ...grpc.CallOption) (*v1.S3UsageResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.S3UsageRequest, ...grpc.CallOption) *v1.S3UsageResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *S3ServiceClient) Usage(ctx context.Context, in *v1.S3UsageRequest, opt } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.S3UsageRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -77,13 +83,13 @@ func (_m *S3ServiceClient) Usage(ctx context.Context, in *v1.S3UsageRequest, opt return r0, r1 } -type NewS3ServiceClientT interface { +type mockConstructorTestingTNewS3ServiceClient interface { mock.TestingT Cleanup(func()) } // NewS3ServiceClient creates a new instance of S3ServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewS3ServiceClient(t NewS3ServiceClientT) *S3ServiceClient { +func NewS3ServiceClient(t mockConstructorTestingTNewS3ServiceClient) *S3ServiceClient { mock := &S3ServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/S3ServiceServer.go b/test/mocks/v1/S3ServiceServer.go index 20df4cf..8fa3f38 100644 --- a/test/mocks/v1/S3ServiceServer.go +++ b/test/mocks/v1/S3ServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *S3ServiceServer) BucketStats(_a0 context.Context, _a1 *v1.S3BucketRepo ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.S3BucketReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.S3BucketReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *S3ServiceServer) BucketStats(_a0 context.Context, _a1 *v1.S3BucketRepo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.S3BucketReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *S3ServiceServer) Usage(_a0 context.Context, _a1 *v1.S3UsageRequest) (* ret := _m.Called(_a0, _a1) var r0 *v1.S3UsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.S3UsageRequest) (*v1.S3UsageResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.S3UsageRequest) *v1.S3UsageResponse); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *S3ServiceServer) Usage(_a0 context.Context, _a1 *v1.S3UsageRequest) (* } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.S3UsageRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -60,13 +66,13 @@ func (_m *S3ServiceServer) Usage(_a0 context.Context, _a1 *v1.S3UsageRequest) (* return r0, r1 } -type NewS3ServiceServerT interface { +type mockConstructorTestingTNewS3ServiceServer interface { mock.TestingT Cleanup(func()) } // NewS3ServiceServer creates a new instance of S3ServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewS3ServiceServer(t NewS3ServiceServerT) *S3ServiceServer { +func NewS3ServiceServer(t mockConstructorTestingTNewS3ServiceServer) *S3ServiceServer { mock := &S3ServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafeClusterServiceServer.go b/test/mocks/v1/UnsafeClusterServiceServer.go index df78fb6..a57d54d 100644 --- a/test/mocks/v1/UnsafeClusterServiceServer.go +++ b/test/mocks/v1/UnsafeClusterServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafeClusterServiceServer) mustEmbedUnimplementedClusterServiceServer _m.Called() } -type NewUnsafeClusterServiceServerT interface { +type mockConstructorTestingTNewUnsafeClusterServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafeClusterServiceServer creates a new instance of UnsafeClusterServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafeClusterServiceServer(t NewUnsafeClusterServiceServerT) *UnsafeClusterServiceServer { +func NewUnsafeClusterServiceServer(t mockConstructorTestingTNewUnsafeClusterServiceServer) *UnsafeClusterServiceServer { mock := &UnsafeClusterServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafeIPServiceServer.go b/test/mocks/v1/UnsafeIPServiceServer.go index dc17cea..21187ab 100644 --- a/test/mocks/v1/UnsafeIPServiceServer.go +++ b/test/mocks/v1/UnsafeIPServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafeIPServiceServer) mustEmbedUnimplementedIPServiceServer() { _m.Called() } -type NewUnsafeIPServiceServerT interface { +type mockConstructorTestingTNewUnsafeIPServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafeIPServiceServer creates a new instance of UnsafeIPServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafeIPServiceServer(t NewUnsafeIPServiceServerT) *UnsafeIPServiceServer { +func NewUnsafeIPServiceServer(t mockConstructorTestingTNewUnsafeIPServiceServer) *UnsafeIPServiceServer { mock := &UnsafeIPServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafeInfoServiceServer.go b/test/mocks/v1/UnsafeInfoServiceServer.go index c573712..63e18e6 100644 --- a/test/mocks/v1/UnsafeInfoServiceServer.go +++ b/test/mocks/v1/UnsafeInfoServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafeInfoServiceServer) mustEmbedUnimplementedInfoServiceServer() { _m.Called() } -type NewUnsafeInfoServiceServerT interface { +type mockConstructorTestingTNewUnsafeInfoServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafeInfoServiceServer creates a new instance of UnsafeInfoServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafeInfoServiceServer(t NewUnsafeInfoServiceServerT) *UnsafeInfoServiceServer { +func NewUnsafeInfoServiceServer(t mockConstructorTestingTNewUnsafeInfoServiceServer) *UnsafeInfoServiceServer { mock := &UnsafeInfoServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafeNetworkTrafficServiceServer.go b/test/mocks/v1/UnsafeNetworkTrafficServiceServer.go index 79eec0a..b4e1976 100644 --- a/test/mocks/v1/UnsafeNetworkTrafficServiceServer.go +++ b/test/mocks/v1/UnsafeNetworkTrafficServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafeNetworkTrafficServiceServer) mustEmbedUnimplementedNetworkTraffi _m.Called() } -type NewUnsafeNetworkTrafficServiceServerT interface { +type mockConstructorTestingTNewUnsafeNetworkTrafficServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafeNetworkTrafficServiceServer creates a new instance of UnsafeNetworkTrafficServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafeNetworkTrafficServiceServer(t NewUnsafeNetworkTrafficServiceServerT) *UnsafeNetworkTrafficServiceServer { +func NewUnsafeNetworkTrafficServiceServer(t mockConstructorTestingTNewUnsafeNetworkTrafficServiceServer) *UnsafeNetworkTrafficServiceServer { mock := &UnsafeNetworkTrafficServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafePodServiceServer.go b/test/mocks/v1/UnsafePodServiceServer.go index 4d6092a..d50fe68 100644 --- a/test/mocks/v1/UnsafePodServiceServer.go +++ b/test/mocks/v1/UnsafePodServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafePodServiceServer) mustEmbedUnimplementedPodServiceServer() { _m.Called() } -type NewUnsafePodServiceServerT interface { +type mockConstructorTestingTNewUnsafePodServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafePodServiceServer creates a new instance of UnsafePodServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafePodServiceServer(t NewUnsafePodServiceServerT) *UnsafePodServiceServer { +func NewUnsafePodServiceServer(t mockConstructorTestingTNewUnsafePodServiceServer) *UnsafePodServiceServer { mock := &UnsafePodServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafePostgresServiceServer.go b/test/mocks/v1/UnsafePostgresServiceServer.go index 5dbaa15..977a40d 100644 --- a/test/mocks/v1/UnsafePostgresServiceServer.go +++ b/test/mocks/v1/UnsafePostgresServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafePostgresServiceServer) mustEmbedUnimplementedPostgresServiceServ _m.Called() } -type NewUnsafePostgresServiceServerT interface { +type mockConstructorTestingTNewUnsafePostgresServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafePostgresServiceServer creates a new instance of UnsafePostgresServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafePostgresServiceServer(t NewUnsafePostgresServiceServerT) *UnsafePostgresServiceServer { +func NewUnsafePostgresServiceServer(t mockConstructorTestingTNewUnsafePostgresServiceServer) *UnsafePostgresServiceServer { mock := &UnsafePostgresServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafeS3ServiceServer.go b/test/mocks/v1/UnsafeS3ServiceServer.go index 37af5ce..1c22f05 100644 --- a/test/mocks/v1/UnsafeS3ServiceServer.go +++ b/test/mocks/v1/UnsafeS3ServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafeS3ServiceServer) mustEmbedUnimplementedS3ServiceServer() { _m.Called() } -type NewUnsafeS3ServiceServerT interface { +type mockConstructorTestingTNewUnsafeS3ServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafeS3ServiceServer creates a new instance of UnsafeS3ServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafeS3ServiceServer(t NewUnsafeS3ServiceServerT) *UnsafeS3ServiceServer { +func NewUnsafeS3ServiceServer(t mockConstructorTestingTNewUnsafeS3ServiceServer) *UnsafeS3ServiceServer { mock := &UnsafeS3ServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/UnsafeVolumeServiceServer.go b/test/mocks/v1/UnsafeVolumeServiceServer.go index b977c40..72bf644 100644 --- a/test/mocks/v1/UnsafeVolumeServiceServer.go +++ b/test/mocks/v1/UnsafeVolumeServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -14,13 +14,13 @@ func (_m *UnsafeVolumeServiceServer) mustEmbedUnimplementedVolumeServiceServer() _m.Called() } -type NewUnsafeVolumeServiceServerT interface { +type mockConstructorTestingTNewUnsafeVolumeServiceServer interface { mock.TestingT Cleanup(func()) } // NewUnsafeVolumeServiceServer creates a new instance of UnsafeVolumeServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewUnsafeVolumeServiceServer(t NewUnsafeVolumeServiceServerT) *UnsafeVolumeServiceServer { +func NewUnsafeVolumeServiceServer(t mockConstructorTestingTNewUnsafeVolumeServiceServer) *UnsafeVolumeServiceServer { mock := &UnsafeVolumeServiceServer{} mock.Mock.Test(t) diff --git a/test/mocks/v1/VolumeServiceClient.go b/test/mocks/v1/VolumeServiceClient.go index bde2e37..0e0b637 100644 --- a/test/mocks/v1/VolumeServiceClient.go +++ b/test/mocks/v1/VolumeServiceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -29,6 +29,10 @@ func (_m *VolumeServiceClient) Added(ctx context.Context, in *v1.VolumeReport, o ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -37,7 +41,6 @@ func (_m *VolumeServiceClient) Added(ctx context.Context, in *v1.VolumeReport, o } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -59,6 +62,10 @@ func (_m *VolumeServiceClient) Deleted(ctx context.Context, in *v1.VolumeReport, ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -67,7 +74,6 @@ func (_m *VolumeServiceClient) Deleted(ctx context.Context, in *v1.VolumeReport, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -89,6 +95,10 @@ func (_m *VolumeServiceClient) Modified(ctx context.Context, in *v1.VolumeReport ret := _m.Called(_ca...) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) (*v1.Empty, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) *v1.Empty); ok { r0 = rf(ctx, in, opts...) } else { @@ -97,7 +107,6 @@ func (_m *VolumeServiceClient) Modified(ctx context.Context, in *v1.VolumeReport } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeReport, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -119,6 +128,10 @@ func (_m *VolumeServiceClient) Usage(ctx context.Context, in *v1.VolumeUsageRequ ret := _m.Called(_ca...) var r0 *v1.VolumeUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeUsageRequest, ...grpc.CallOption) (*v1.VolumeUsageResponse, error)); ok { + return rf(ctx, in, opts...) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeUsageRequest, ...grpc.CallOption) *v1.VolumeUsageResponse); ok { r0 = rf(ctx, in, opts...) } else { @@ -127,7 +140,6 @@ func (_m *VolumeServiceClient) Usage(ctx context.Context, in *v1.VolumeUsageRequ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeUsageRequest, ...grpc.CallOption) error); ok { r1 = rf(ctx, in, opts...) } else { @@ -137,13 +149,13 @@ func (_m *VolumeServiceClient) Usage(ctx context.Context, in *v1.VolumeUsageRequ return r0, r1 } -type NewVolumeServiceClientT interface { +type mockConstructorTestingTNewVolumeServiceClient interface { mock.TestingT Cleanup(func()) } // NewVolumeServiceClient creates a new instance of VolumeServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewVolumeServiceClient(t NewVolumeServiceClientT) *VolumeServiceClient { +func NewVolumeServiceClient(t mockConstructorTestingTNewVolumeServiceClient) *VolumeServiceClient { mock := &VolumeServiceClient{} mock.Mock.Test(t) diff --git a/test/mocks/v1/VolumeServiceServer.go b/test/mocks/v1/VolumeServiceServer.go index afcd848..bfe27c5 100644 --- a/test/mocks/v1/VolumeServiceServer.go +++ b/test/mocks/v1/VolumeServiceServer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.12.3. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,10 @@ func (_m *VolumeServiceServer) Added(_a0 context.Context, _a1 *v1.VolumeReport) ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -27,7 +31,6 @@ func (_m *VolumeServiceServer) Added(_a0 context.Context, _a1 *v1.VolumeReport) } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -42,6 +45,10 @@ func (_m *VolumeServiceServer) Deleted(_a0 context.Context, _a1 *v1.VolumeReport ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -50,7 +57,6 @@ func (_m *VolumeServiceServer) Deleted(_a0 context.Context, _a1 *v1.VolumeReport } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -65,6 +71,10 @@ func (_m *VolumeServiceServer) Modified(_a0 context.Context, _a1 *v1.VolumeRepor ret := _m.Called(_a0, _a1) var r0 *v1.Empty + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport) (*v1.Empty, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeReport) *v1.Empty); ok { r0 = rf(_a0, _a1) } else { @@ -73,7 +83,6 @@ func (_m *VolumeServiceServer) Modified(_a0 context.Context, _a1 *v1.VolumeRepor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeReport) error); ok { r1 = rf(_a0, _a1) } else { @@ -88,6 +97,10 @@ func (_m *VolumeServiceServer) Usage(_a0 context.Context, _a1 *v1.VolumeUsageReq ret := _m.Called(_a0, _a1) var r0 *v1.VolumeUsageResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeUsageRequest) (*v1.VolumeUsageResponse, error)); ok { + return rf(_a0, _a1) + } if rf, ok := ret.Get(0).(func(context.Context, *v1.VolumeUsageRequest) *v1.VolumeUsageResponse); ok { r0 = rf(_a0, _a1) } else { @@ -96,7 +109,6 @@ func (_m *VolumeServiceServer) Usage(_a0 context.Context, _a1 *v1.VolumeUsageReq } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *v1.VolumeUsageRequest) error); ok { r1 = rf(_a0, _a1) } else { @@ -106,13 +118,13 @@ func (_m *VolumeServiceServer) Usage(_a0 context.Context, _a1 *v1.VolumeUsageReq return r0, r1 } -type NewVolumeServiceServerT interface { +type mockConstructorTestingTNewVolumeServiceServer interface { mock.TestingT Cleanup(func()) } // NewVolumeServiceServer creates a new instance of VolumeServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewVolumeServiceServer(t NewVolumeServiceServerT) *VolumeServiceServer { +func NewVolumeServiceServer(t mockConstructorTestingTNewVolumeServiceServer) *VolumeServiceServer { mock := &VolumeServiceServer{} mock.Mock.Test(t)