diff --git a/api/go.mod b/api/go.mod index ed49302ba..cd25a56ae 100644 --- a/api/go.mod +++ b/api/go.mod @@ -7,7 +7,7 @@ require ( github.com/hashicorp/boundary/sdk v0.0.53 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-kms-wrapping/v2 v2.0.18 - github.com/hashicorp/go-retryablehttp v0.7.7 + github.com/hashicorp/go-retryablehttp v0.7.8 github.com/hashicorp/go-rootcerts v1.0.2 github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 diff --git a/api/go.sum b/api/go.sum index 07a63ea79..9c78cb9d5 100644 --- a/api/go.sum +++ b/api/go.sum @@ -42,8 +42,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg= github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0= -github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= -github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48= +github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng= diff --git a/go.mod b/go.mod index 797e1e9fc..f9de28c57 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/golang/protobuf v1.5.4 github.com/google/go-cmp v0.7.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 github.com/hashicorp/boundary/api v0.0.54 github.com/hashicorp/boundary/sdk v0.0.53 github.com/hashicorp/cap v0.9.0 @@ -37,7 +37,7 @@ require ( github.com/hashicorp/go-kms-wrapping/v2 v2.0.18 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-rate v0.0.0-20231204194614-cc8d401f70ab - github.com/hashicorp/go-retryablehttp v0.7.7 + github.com/hashicorp/go-retryablehttp v0.7.8 github.com/hashicorp/go-rootcerts v1.0.2 github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 github.com/hashicorp/go-secure-stdlib/configutil/v2 v2.0.12 @@ -95,7 +95,7 @@ require ( golang.org/x/text v0.26.0 golang.org/x/tools v0.34.0 google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de - google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 + google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 google.golang.org/grpc v1.73.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 google.golang.org/protobuf v1.36.6 @@ -214,9 +214,9 @@ require ( go.opentelemetry.io/otel/metric v1.36.0 // indirect go.opentelemetry.io/otel/trace v1.36.0 // indirect golang.org/x/mod v0.25.0 // indirect - golang.org/x/oauth2 v0.29.0 // indirect + golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/time v0.12.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/sqlite v1.5.6 // indirect diff --git a/go.sum b/go.sum index 727c486dd..840ed5403 100644 --- a/go.sum +++ b/go.sum @@ -186,8 +186,8 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+ github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 h1:+epNPbD5EqgpEMm5wrl4Hqts3jZt8+kYaqUisuuIGTk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90= github.com/hashicorp/cap v0.9.0 h1:B5IZT7VL1ruSCtVBXSIyWDpkAFiEZt4bQFk1e2WwCb0= github.com/hashicorp/cap v0.9.0/go.mod h1:J00roe8PFFYXfedm3WcO6sGVaKeYElmNOuqfi8Uero4= github.com/hashicorp/cap/ldap v0.0.0-20240206183135-ed8f24513744 h1:6cU01ORaCUxRXRS0YYnmm4tMfAvFRjamhjgMrgmoWZs= @@ -226,8 +226,8 @@ github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0U github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0= github.com/hashicorp/go-rate v0.0.0-20231204194614-cc8d401f70ab h1:XIeGyyCCS80b5MKfU4E6ioLocIYtT4FmfdNH0uNYQi8= github.com/hashicorp/go-rate v0.0.0-20231204194614-cc8d401f70ab/go.mod h1:uTQC66EFZuSKunHYx0hHIfdH3nhRrv7UOOE8Ug0yI0A= -github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= -github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48= +github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng= @@ -618,8 +618,8 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98= -golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= +golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= +golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -704,10 +704,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 h1:hE3bRWtU6uceqlh4fhrSnUyjKHMKB9KrTLLG+bc0ddM= -google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463/go.mod h1:U90ffi8eUL9MwPcrJylN5+Mk2v3vuPDptd5yyNUiRR8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY= +google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= 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= diff --git a/internal/gen/controller/api/services/account_service.pb.gw.go b/internal/gen/controller/api/services/account_service.pb.gw.go index a76d11a05..b0cbc6aba 100644 --- a/internal/gen/controller/api/services/account_service.pb.gw.go +++ b/internal/gen/controller/api/services/account_service.pb.gw.go @@ -41,7 +41,9 @@ func request_AccountService_GetAccount_0(ctx context.Context, marshaler runtime. metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_AccountService_ListAccounts_0(ctx context.Context, marshaler runtim protoReq ListAccountsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_AccountService_CreateAccount_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateAccount(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_AccountService_UpdateAccount_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_AccountService_DeleteAccount_0(ctx context.Context, marshaler runti metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -253,6 +265,9 @@ func request_AccountService_SetPassword_0(ctx context.Context, marshaler runtime if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -295,6 +310,9 @@ func request_AccountService_ChangePassword_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -641,7 +659,8 @@ type response_AccountService_GetAccount_0 struct { } func (m response_AccountService_GetAccount_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetAccountResponse + return response.Item } type response_AccountService_CreateAccount_0 struct { @@ -649,7 +668,8 @@ type response_AccountService_CreateAccount_0 struct { } func (m response_AccountService_CreateAccount_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateAccountResponse + return response.Item } type response_AccountService_UpdateAccount_0 struct { @@ -657,7 +677,8 @@ type response_AccountService_UpdateAccount_0 struct { } func (m response_AccountService_UpdateAccount_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateAccountResponse + return response.Item } type response_AccountService_SetPassword_0 struct { @@ -665,7 +686,8 @@ type response_AccountService_SetPassword_0 struct { } func (m response_AccountService_SetPassword_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetPasswordResponse + return response.Item } type response_AccountService_ChangePassword_0 struct { @@ -673,7 +695,8 @@ type response_AccountService_ChangePassword_0 struct { } func (m response_AccountService_ChangePassword_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.ChangePasswordResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/alias_service.pb.gw.go b/internal/gen/controller/api/services/alias_service.pb.gw.go index 4d374db29..f8b7f1687 100644 --- a/internal/gen/controller/api/services/alias_service.pb.gw.go +++ b/internal/gen/controller/api/services/alias_service.pb.gw.go @@ -41,7 +41,9 @@ func request_AliasService_GetAlias_0(ctx context.Context, marshaler runtime.Mars metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_AliasService_ListAliases_0(ctx context.Context, marshaler runtime.M protoReq ListAliasesRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_AliasService_CreateAlias_0(ctx context.Context, marshaler runtime.M if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateAlias(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_AliasService_UpdateAlias_0(ctx context.Context, marshaler runtime.M if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_AliasService_DeleteAlias_0(ctx context.Context, marshaler runtime.M metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -483,7 +495,8 @@ type response_AliasService_GetAlias_0 struct { } func (m response_AliasService_GetAlias_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetAliasResponse + return response.Item } type response_AliasService_CreateAlias_0 struct { @@ -491,7 +504,8 @@ type response_AliasService_CreateAlias_0 struct { } func (m response_AliasService_CreateAlias_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateAliasResponse + return response.Item } type response_AliasService_UpdateAlias_0 struct { @@ -499,7 +513,8 @@ type response_AliasService_UpdateAlias_0 struct { } func (m response_AliasService_UpdateAlias_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateAliasResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/auth_method_service.pb.gw.go b/internal/gen/controller/api/services/auth_method_service.pb.gw.go index 2c904078b..ac6574e27 100644 --- a/internal/gen/controller/api/services/auth_method_service.pb.gw.go +++ b/internal/gen/controller/api/services/auth_method_service.pb.gw.go @@ -41,7 +41,9 @@ func request_AuthMethodService_GetAuthMethod_0(ctx context.Context, marshaler ru metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_AuthMethodService_ListAuthMethods_0(ctx context.Context, marshaler protoReq ListAuthMethodsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_AuthMethodService_CreateAuthMethod_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateAuthMethod(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_AuthMethodService_UpdateAuthMethod_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_AuthMethodService_DeleteAuthMethod_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -253,6 +265,9 @@ func request_AuthMethodService_ChangeState_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -295,6 +310,9 @@ func request_AuthMethodService_Authenticate_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["auth_method_id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "auth_method_id") @@ -641,7 +659,8 @@ type response_AuthMethodService_GetAuthMethod_0 struct { } func (m response_AuthMethodService_GetAuthMethod_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetAuthMethodResponse + return response.Item } type response_AuthMethodService_CreateAuthMethod_0 struct { @@ -649,7 +668,8 @@ type response_AuthMethodService_CreateAuthMethod_0 struct { } func (m response_AuthMethodService_CreateAuthMethod_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateAuthMethodResponse + return response.Item } type response_AuthMethodService_UpdateAuthMethod_0 struct { @@ -657,7 +677,8 @@ type response_AuthMethodService_UpdateAuthMethod_0 struct { } func (m response_AuthMethodService_UpdateAuthMethod_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateAuthMethodResponse + return response.Item } type response_AuthMethodService_ChangeState_0 struct { @@ -665,7 +686,8 @@ type response_AuthMethodService_ChangeState_0 struct { } func (m response_AuthMethodService_ChangeState_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.ChangeStateResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/authtokens_service.pb.gw.go b/internal/gen/controller/api/services/authtokens_service.pb.gw.go index e79a7e728..8268367c4 100644 --- a/internal/gen/controller/api/services/authtokens_service.pb.gw.go +++ b/internal/gen/controller/api/services/authtokens_service.pb.gw.go @@ -41,7 +41,9 @@ func request_AuthTokenService_GetAuthToken_0(ctx context.Context, marshaler runt metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_AuthTokenService_ListAuthTokens_0(ctx context.Context, marshaler ru protoReq ListAuthTokensRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -111,7 +115,9 @@ func request_AuthTokenService_DeleteAuthToken_0(ctx context.Context, marshaler r metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -307,7 +313,8 @@ type response_AuthTokenService_GetAuthToken_0 struct { } func (m response_AuthTokenService_GetAuthToken_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetAuthTokenResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/billing_service.pb.gw.go b/internal/gen/controller/api/services/billing_service.pb.gw.go index 826d8b837..8524fb084 100644 --- a/internal/gen/controller/api/services/billing_service.pb.gw.go +++ b/internal/gen/controller/api/services/billing_service.pb.gw.go @@ -42,7 +42,9 @@ func request_BillingService_MonthlyActiveUsers_0(ctx context.Context, marshaler protoReq MonthlyActiveUsersRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/internal/gen/controller/api/services/credential_library_service.pb.gw.go b/internal/gen/controller/api/services/credential_library_service.pb.gw.go index b7e7093c6..b36f47695 100644 --- a/internal/gen/controller/api/services/credential_library_service.pb.gw.go +++ b/internal/gen/controller/api/services/credential_library_service.pb.gw.go @@ -41,7 +41,9 @@ func request_CredentialLibraryService_GetCredentialLibrary_0(ctx context.Context metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_CredentialLibraryService_ListCredentialLibraries_0(ctx context.Cont protoReq ListCredentialLibrariesRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_CredentialLibraryService_CreateCredentialLibrary_0(ctx context.Cont if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateCredentialLibrary(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_CredentialLibraryService_UpdateCredentialLibrary_0(ctx context.Cont if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_CredentialLibraryService_DeleteCredentialLibrary_0(ctx context.Cont metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -483,7 +495,8 @@ type response_CredentialLibraryService_GetCredentialLibrary_0 struct { } func (m response_CredentialLibraryService_GetCredentialLibrary_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetCredentialLibraryResponse + return response.Item } type response_CredentialLibraryService_CreateCredentialLibrary_0 struct { @@ -491,7 +504,8 @@ type response_CredentialLibraryService_CreateCredentialLibrary_0 struct { } func (m response_CredentialLibraryService_CreateCredentialLibrary_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateCredentialLibraryResponse + return response.Item } type response_CredentialLibraryService_UpdateCredentialLibrary_0 struct { @@ -499,7 +513,8 @@ type response_CredentialLibraryService_UpdateCredentialLibrary_0 struct { } func (m response_CredentialLibraryService_UpdateCredentialLibrary_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateCredentialLibraryResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/credential_service.pb.gw.go b/internal/gen/controller/api/services/credential_service.pb.gw.go index d4a938039..2ff20fc9c 100644 --- a/internal/gen/controller/api/services/credential_service.pb.gw.go +++ b/internal/gen/controller/api/services/credential_service.pb.gw.go @@ -41,7 +41,9 @@ func request_CredentialService_GetCredential_0(ctx context.Context, marshaler ru metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_CredentialService_ListCredentials_0(ctx context.Context, marshaler protoReq ListCredentialsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_CredentialService_CreateCredential_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateCredential(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_CredentialService_UpdateCredential_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_CredentialService_DeleteCredential_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -483,7 +495,8 @@ type response_CredentialService_GetCredential_0 struct { } func (m response_CredentialService_GetCredential_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetCredentialResponse + return response.Item } type response_CredentialService_CreateCredential_0 struct { @@ -491,7 +504,8 @@ type response_CredentialService_CreateCredential_0 struct { } func (m response_CredentialService_CreateCredential_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateCredentialResponse + return response.Item } type response_CredentialService_UpdateCredential_0 struct { @@ -499,7 +513,8 @@ type response_CredentialService_UpdateCredential_0 struct { } func (m response_CredentialService_UpdateCredential_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateCredentialResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/credential_store_service.pb.gw.go b/internal/gen/controller/api/services/credential_store_service.pb.gw.go index 9dd51ba93..239fa55c0 100644 --- a/internal/gen/controller/api/services/credential_store_service.pb.gw.go +++ b/internal/gen/controller/api/services/credential_store_service.pb.gw.go @@ -41,7 +41,9 @@ func request_CredentialStoreService_GetCredentialStore_0(ctx context.Context, ma metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_CredentialStoreService_ListCredentialStores_0(ctx context.Context, protoReq ListCredentialStoresRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_CredentialStoreService_CreateCredentialStore_0(ctx context.Context, if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateCredentialStore(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_CredentialStoreService_UpdateCredentialStore_0(ctx context.Context, if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_CredentialStoreService_DeleteCredentialStore_0(ctx context.Context, metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -483,7 +495,8 @@ type response_CredentialStoreService_GetCredentialStore_0 struct { } func (m response_CredentialStoreService_GetCredentialStore_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetCredentialStoreResponse + return response.Item } type response_CredentialStoreService_CreateCredentialStore_0 struct { @@ -491,7 +504,8 @@ type response_CredentialStoreService_CreateCredentialStore_0 struct { } func (m response_CredentialStoreService_CreateCredentialStore_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateCredentialStoreResponse + return response.Item } type response_CredentialStoreService_UpdateCredentialStore_0 struct { @@ -499,7 +513,8 @@ type response_CredentialStoreService_UpdateCredentialStore_0 struct { } func (m response_CredentialStoreService_UpdateCredentialStore_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateCredentialStoreResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/group_service.pb.gw.go b/internal/gen/controller/api/services/group_service.pb.gw.go index 15d627db2..e15aef218 100644 --- a/internal/gen/controller/api/services/group_service.pb.gw.go +++ b/internal/gen/controller/api/services/group_service.pb.gw.go @@ -41,7 +41,9 @@ func request_GroupService_GetGroup_0(ctx context.Context, marshaler runtime.Mars metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_GroupService_ListGroups_0(ctx context.Context, marshaler runtime.Ma protoReq ListGroupsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_GroupService_CreateGroup_0(ctx context.Context, marshaler runtime.M if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateGroup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_GroupService_UpdateGroup_0(ctx context.Context, marshaler runtime.M if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_GroupService_DeleteGroup_0(ctx context.Context, marshaler runtime.M metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -253,6 +265,9 @@ func request_GroupService_AddGroupMembers_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -295,6 +310,9 @@ func request_GroupService_SetGroupMembers_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -337,6 +355,9 @@ func request_GroupService_RemoveGroupMembers_0(ctx context.Context, marshaler ru if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -720,7 +741,8 @@ type response_GroupService_GetGroup_0 struct { } func (m response_GroupService_GetGroup_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetGroupResponse + return response.Item } type response_GroupService_CreateGroup_0 struct { @@ -728,7 +750,8 @@ type response_GroupService_CreateGroup_0 struct { } func (m response_GroupService_CreateGroup_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateGroupResponse + return response.Item } type response_GroupService_UpdateGroup_0 struct { @@ -736,7 +759,8 @@ type response_GroupService_UpdateGroup_0 struct { } func (m response_GroupService_UpdateGroup_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateGroupResponse + return response.Item } type response_GroupService_AddGroupMembers_0 struct { @@ -744,7 +768,8 @@ type response_GroupService_AddGroupMembers_0 struct { } func (m response_GroupService_AddGroupMembers_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddGroupMembersResponse + return response.Item } type response_GroupService_SetGroupMembers_0 struct { @@ -752,7 +777,8 @@ type response_GroupService_SetGroupMembers_0 struct { } func (m response_GroupService_SetGroupMembers_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetGroupMembersResponse + return response.Item } type response_GroupService_RemoveGroupMembers_0 struct { @@ -760,7 +786,8 @@ type response_GroupService_RemoveGroupMembers_0 struct { } func (m response_GroupService_RemoveGroupMembers_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveGroupMembersResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/host_catalog_service.pb.gw.go b/internal/gen/controller/api/services/host_catalog_service.pb.gw.go index bf2da2954..57496c4e8 100644 --- a/internal/gen/controller/api/services/host_catalog_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_catalog_service.pb.gw.go @@ -41,7 +41,9 @@ func request_HostCatalogService_GetHostCatalog_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_HostCatalogService_ListHostCatalogs_0(ctx context.Context, marshale protoReq ListHostCatalogsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -115,6 +119,9 @@ func request_HostCatalogService_CreateHostCatalog_0(ctx context.Context, marshal if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -158,6 +165,9 @@ func request_HostCatalogService_UpdateHostCatalog_0(ctx context.Context, marshal if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -227,7 +237,9 @@ func request_HostCatalogService_DeleteHostCatalog_0(ctx context.Context, marshal metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -497,7 +509,8 @@ type response_HostCatalogService_GetHostCatalog_0 struct { } func (m response_HostCatalogService_GetHostCatalog_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetHostCatalogResponse + return response.Item } type response_HostCatalogService_CreateHostCatalog_0 struct { @@ -505,7 +518,8 @@ type response_HostCatalogService_CreateHostCatalog_0 struct { } func (m response_HostCatalogService_CreateHostCatalog_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateHostCatalogResponse + return response.Item } type response_HostCatalogService_UpdateHostCatalog_0 struct { @@ -513,7 +527,8 @@ type response_HostCatalogService_UpdateHostCatalog_0 struct { } func (m response_HostCatalogService_UpdateHostCatalog_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateHostCatalogResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/host_service.pb.gw.go b/internal/gen/controller/api/services/host_service.pb.gw.go index 185f43a2e..ffdc54ad4 100644 --- a/internal/gen/controller/api/services/host_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_service.pb.gw.go @@ -41,7 +41,9 @@ func request_HostService_GetHost_0(ctx context.Context, marshaler runtime.Marsha metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_HostService_ListHosts_0(ctx context.Context, marshaler runtime.Mars protoReq ListHostsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_HostService_CreateHost_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateHost(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_HostService_UpdateHost_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_HostService_DeleteHost_0(ctx context.Context, marshaler runtime.Mar metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -483,7 +495,8 @@ type response_HostService_GetHost_0 struct { } func (m response_HostService_GetHost_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetHostResponse + return response.Item } type response_HostService_CreateHost_0 struct { @@ -491,7 +504,8 @@ type response_HostService_CreateHost_0 struct { } func (m response_HostService_CreateHost_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateHostResponse + return response.Item } type response_HostService_UpdateHost_0 struct { @@ -499,7 +513,8 @@ type response_HostService_UpdateHost_0 struct { } func (m response_HostService_UpdateHost_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateHostResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/host_set_service.pb.gw.go b/internal/gen/controller/api/services/host_set_service.pb.gw.go index 87cf2c878..82c8e5ed5 100644 --- a/internal/gen/controller/api/services/host_set_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_set_service.pb.gw.go @@ -41,7 +41,9 @@ func request_HostSetService_GetHostSet_0(ctx context.Context, marshaler runtime. metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_HostSetService_ListHostSets_0(ctx context.Context, marshaler runtim protoReq ListHostSetsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_HostSetService_CreateHostSet_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateHostSet(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_HostSetService_UpdateHostSet_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_HostSetService_DeleteHostSet_0(ctx context.Context, marshaler runti metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -253,6 +265,9 @@ func request_HostSetService_AddHostSetHosts_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -295,6 +310,9 @@ func request_HostSetService_SetHostSetHosts_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -337,6 +355,9 @@ func request_HostSetService_RemoveHostSetHosts_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -720,7 +741,8 @@ type response_HostSetService_GetHostSet_0 struct { } func (m response_HostSetService_GetHostSet_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetHostSetResponse + return response.Item } type response_HostSetService_CreateHostSet_0 struct { @@ -728,7 +750,8 @@ type response_HostSetService_CreateHostSet_0 struct { } func (m response_HostSetService_CreateHostSet_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateHostSetResponse + return response.Item } type response_HostSetService_UpdateHostSet_0 struct { @@ -736,7 +759,8 @@ type response_HostSetService_UpdateHostSet_0 struct { } func (m response_HostSetService_UpdateHostSet_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateHostSetResponse + return response.Item } type response_HostSetService_AddHostSetHosts_0 struct { @@ -744,7 +768,8 @@ type response_HostSetService_AddHostSetHosts_0 struct { } func (m response_HostSetService_AddHostSetHosts_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddHostSetHostsResponse + return response.Item } type response_HostSetService_SetHostSetHosts_0 struct { @@ -752,7 +777,8 @@ type response_HostSetService_SetHostSetHosts_0 struct { } func (m response_HostSetService_SetHostSetHosts_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetHostSetHostsResponse + return response.Item } type response_HostSetService_RemoveHostSetHosts_0 struct { @@ -760,7 +786,8 @@ type response_HostSetService_RemoveHostSetHosts_0 struct { } func (m response_HostSetService_RemoveHostSetHosts_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveHostSetHostsResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/managed_group_service.pb.gw.go b/internal/gen/controller/api/services/managed_group_service.pb.gw.go index 5869e8894..2e51f0d06 100644 --- a/internal/gen/controller/api/services/managed_group_service.pb.gw.go +++ b/internal/gen/controller/api/services/managed_group_service.pb.gw.go @@ -41,7 +41,9 @@ func request_ManagedGroupService_GetManagedGroup_0(ctx context.Context, marshale metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_ManagedGroupService_ListManagedGroups_0(ctx context.Context, marsha protoReq ListManagedGroupsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_ManagedGroupService_CreateManagedGroup_0(ctx context.Context, marsh if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateManagedGroup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_ManagedGroupService_UpdateManagedGroup_0(ctx context.Context, marsh if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_ManagedGroupService_DeleteManagedGroup_0(ctx context.Context, marsh metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -483,7 +495,8 @@ type response_ManagedGroupService_GetManagedGroup_0 struct { } func (m response_ManagedGroupService_GetManagedGroup_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetManagedGroupResponse + return response.Item } type response_ManagedGroupService_CreateManagedGroup_0 struct { @@ -491,7 +504,8 @@ type response_ManagedGroupService_CreateManagedGroup_0 struct { } func (m response_ManagedGroupService_CreateManagedGroup_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateManagedGroupResponse + return response.Item } type response_ManagedGroupService_UpdateManagedGroup_0 struct { @@ -499,7 +513,8 @@ type response_ManagedGroupService_UpdateManagedGroup_0 struct { } func (m response_ManagedGroupService_UpdateManagedGroup_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateManagedGroupResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/policy_service.pb.gw.go b/internal/gen/controller/api/services/policy_service.pb.gw.go index f15636f24..d8083db91 100644 --- a/internal/gen/controller/api/services/policy_service.pb.gw.go +++ b/internal/gen/controller/api/services/policy_service.pb.gw.go @@ -41,7 +41,9 @@ func request_PolicyService_GetPolicy_0(ctx context.Context, marshaler runtime.Ma metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_PolicyService_ListPolicies_0(ctx context.Context, marshaler runtime protoReq ListPoliciesRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_PolicyService_CreatePolicy_0(ctx context.Context, marshaler runtime if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_PolicyService_UpdatePolicy_0(ctx context.Context, marshaler runtime if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_PolicyService_DeletePolicy_0(ctx context.Context, marshaler runtime metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -483,7 +495,8 @@ type response_PolicyService_GetPolicy_0 struct { } func (m response_PolicyService_GetPolicy_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetPolicyResponse + return response.Item } type response_PolicyService_CreatePolicy_0 struct { @@ -491,7 +504,8 @@ type response_PolicyService_CreatePolicy_0 struct { } func (m response_PolicyService_CreatePolicy_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreatePolicyResponse + return response.Item } type response_PolicyService_UpdatePolicy_0 struct { @@ -499,7 +513,8 @@ type response_PolicyService_UpdatePolicy_0 struct { } func (m response_PolicyService_UpdatePolicy_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdatePolicyResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/role_service.pb.gw.go b/internal/gen/controller/api/services/role_service.pb.gw.go index 1a0ccefa3..87bc3dad5 100644 --- a/internal/gen/controller/api/services/role_service.pb.gw.go +++ b/internal/gen/controller/api/services/role_service.pb.gw.go @@ -41,7 +41,9 @@ func request_RoleService_GetRole_0(ctx context.Context, marshaler runtime.Marsha metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_RoleService_ListRoles_0(ctx context.Context, marshaler runtime.Mars protoReq ListRolesRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_RoleService_CreateRole_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateRole(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_RoleService_UpdateRole_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_RoleService_DeleteRole_0(ctx context.Context, marshaler runtime.Mar metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -253,6 +265,9 @@ func request_RoleService_AddRolePrincipals_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -295,6 +310,9 @@ func request_RoleService_SetRolePrincipals_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -337,6 +355,9 @@ func request_RoleService_RemoveRolePrincipals_0(ctx context.Context, marshaler r if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -379,6 +400,9 @@ func request_RoleService_AddRoleGrants_0(ctx context.Context, marshaler runtime. if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -421,6 +445,9 @@ func request_RoleService_SetRoleGrants_0(ctx context.Context, marshaler runtime. if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -463,6 +490,9 @@ func request_RoleService_RemoveRoleGrants_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -505,6 +535,9 @@ func request_RoleService_AddRoleGrantScopes_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -547,6 +580,9 @@ func request_RoleService_SetRoleGrantScopes_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -589,6 +625,9 @@ func request_RoleService_RemoveRoleGrantScopes_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -1194,7 +1233,8 @@ type response_RoleService_GetRole_0 struct { } func (m response_RoleService_GetRole_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetRoleResponse + return response.Item } type response_RoleService_CreateRole_0 struct { @@ -1202,7 +1242,8 @@ type response_RoleService_CreateRole_0 struct { } func (m response_RoleService_CreateRole_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateRoleResponse + return response.Item } type response_RoleService_UpdateRole_0 struct { @@ -1210,7 +1251,8 @@ type response_RoleService_UpdateRole_0 struct { } func (m response_RoleService_UpdateRole_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateRoleResponse + return response.Item } type response_RoleService_AddRolePrincipals_0 struct { @@ -1218,7 +1260,8 @@ type response_RoleService_AddRolePrincipals_0 struct { } func (m response_RoleService_AddRolePrincipals_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddRolePrincipalsResponse + return response.Item } type response_RoleService_SetRolePrincipals_0 struct { @@ -1226,7 +1269,8 @@ type response_RoleService_SetRolePrincipals_0 struct { } func (m response_RoleService_SetRolePrincipals_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetRolePrincipalsResponse + return response.Item } type response_RoleService_RemoveRolePrincipals_0 struct { @@ -1234,7 +1278,8 @@ type response_RoleService_RemoveRolePrincipals_0 struct { } func (m response_RoleService_RemoveRolePrincipals_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveRolePrincipalsResponse + return response.Item } type response_RoleService_AddRoleGrants_0 struct { @@ -1242,7 +1287,8 @@ type response_RoleService_AddRoleGrants_0 struct { } func (m response_RoleService_AddRoleGrants_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddRoleGrantsResponse + return response.Item } type response_RoleService_SetRoleGrants_0 struct { @@ -1250,7 +1296,8 @@ type response_RoleService_SetRoleGrants_0 struct { } func (m response_RoleService_SetRoleGrants_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetRoleGrantsResponse + return response.Item } type response_RoleService_RemoveRoleGrants_0 struct { @@ -1258,7 +1305,8 @@ type response_RoleService_RemoveRoleGrants_0 struct { } func (m response_RoleService_RemoveRoleGrants_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveRoleGrantsResponse + return response.Item } type response_RoleService_AddRoleGrantScopes_0 struct { @@ -1266,7 +1314,8 @@ type response_RoleService_AddRoleGrantScopes_0 struct { } func (m response_RoleService_AddRoleGrantScopes_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddRoleGrantScopesResponse + return response.Item } type response_RoleService_SetRoleGrantScopes_0 struct { @@ -1274,7 +1323,8 @@ type response_RoleService_SetRoleGrantScopes_0 struct { } func (m response_RoleService_SetRoleGrantScopes_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetRoleGrantScopesResponse + return response.Item } type response_RoleService_RemoveRoleGrantScopes_0 struct { @@ -1282,7 +1332,8 @@ type response_RoleService_RemoveRoleGrantScopes_0 struct { } func (m response_RoleService_RemoveRoleGrantScopes_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveRoleGrantScopesResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/scope_service.pb.gw.go b/internal/gen/controller/api/services/scope_service.pb.gw.go index 6afab8cfb..70291d584 100644 --- a/internal/gen/controller/api/services/scope_service.pb.gw.go +++ b/internal/gen/controller/api/services/scope_service.pb.gw.go @@ -41,7 +41,9 @@ func request_ScopeService_GetScope_0(ctx context.Context, marshaler runtime.Mars metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_ScopeService_ListScopes_0(ctx context.Context, marshaler runtime.Ma protoReq ListScopesRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -115,6 +119,9 @@ func request_ScopeService_CreateScope_0(ctx context.Context, marshaler runtime.M if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -158,6 +165,9 @@ func request_ScopeService_UpdateScope_0(ctx context.Context, marshaler runtime.M if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -227,7 +237,9 @@ func request_ScopeService_DeleteScope_0(ctx context.Context, marshaler runtime.M metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -264,7 +276,9 @@ func request_ScopeService_ListKeys_0(ctx context.Context, marshaler runtime.Mars metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -303,6 +317,9 @@ func request_ScopeService_RotateKeys_0(ctx context.Context, marshaler runtime.Ma if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.RotateKeys(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -325,7 +342,9 @@ func request_ScopeService_ListKeyVersionDestructionJobs_0(ctx context.Context, m metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["scope_id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "scope_id") @@ -364,6 +383,9 @@ func request_ScopeService_DestroyKeyVersion_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.DestroyKeyVersion(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -389,6 +411,9 @@ func request_ScopeService_AttachStoragePolicy_0(ctx context.Context, marshaler r if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -431,6 +456,9 @@ func request_ScopeService_DetachStoragePolicy_0(ctx context.Context, marshaler r if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -925,7 +953,8 @@ type response_ScopeService_GetScope_0 struct { } func (m response_ScopeService_GetScope_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetScopeResponse + return response.Item } type response_ScopeService_CreateScope_0 struct { @@ -933,7 +962,8 @@ type response_ScopeService_CreateScope_0 struct { } func (m response_ScopeService_CreateScope_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateScopeResponse + return response.Item } type response_ScopeService_UpdateScope_0 struct { @@ -941,7 +971,8 @@ type response_ScopeService_UpdateScope_0 struct { } func (m response_ScopeService_UpdateScope_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateScopeResponse + return response.Item } type response_ScopeService_AttachStoragePolicy_0 struct { @@ -949,7 +980,8 @@ type response_ScopeService_AttachStoragePolicy_0 struct { } func (m response_ScopeService_AttachStoragePolicy_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AttachStoragePolicyResponse + return response.Item } type response_ScopeService_DetachStoragePolicy_0 struct { @@ -957,7 +989,8 @@ type response_ScopeService_DetachStoragePolicy_0 struct { } func (m response_ScopeService_DetachStoragePolicy_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.DetachStoragePolicyResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/session_recording_service.pb.gw.go b/internal/gen/controller/api/services/session_recording_service.pb.gw.go index 85531fc02..c0ba7021b 100644 --- a/internal/gen/controller/api/services/session_recording_service.pb.gw.go +++ b/internal/gen/controller/api/services/session_recording_service.pb.gw.go @@ -41,7 +41,9 @@ func request_SessionRecordingService_GetSessionRecording_0(ctx context.Context, metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_SessionRecordingService_ListSessionRecordings_0(ctx context.Context protoReq ListSessionRecordingsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,7 +117,9 @@ func request_SessionRecordingService_Download_0(ctx context.Context, marshaler r metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -146,7 +152,9 @@ func request_SessionRecordingService_ReApplyStoragePolicy_0(ctx context.Context, metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -183,7 +191,9 @@ func request_SessionRecordingService_DeleteSessionRecording_0(ctx context.Contex metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -440,7 +450,8 @@ type response_SessionRecordingService_GetSessionRecording_0 struct { } func (m response_SessionRecordingService_GetSessionRecording_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetSessionRecordingResponse + return response.Item } type response_SessionRecordingService_ReApplyStoragePolicy_0 struct { @@ -448,7 +459,8 @@ type response_SessionRecordingService_ReApplyStoragePolicy_0 struct { } func (m response_SessionRecordingService_ReApplyStoragePolicy_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.ReApplyStoragePolicyResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/session_service.pb.gw.go b/internal/gen/controller/api/services/session_service.pb.gw.go index dba34114c..93b0ab2f4 100644 --- a/internal/gen/controller/api/services/session_service.pb.gw.go +++ b/internal/gen/controller/api/services/session_service.pb.gw.go @@ -41,7 +41,9 @@ func request_SessionService_GetSession_0(ctx context.Context, marshaler runtime. metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_SessionService_ListSessions_0(ctx context.Context, marshaler runtim protoReq ListSessionsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -114,6 +118,9 @@ func request_SessionService_CancelSession_0(ctx context.Context, marshaler runti if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -312,7 +319,8 @@ type response_SessionService_GetSession_0 struct { } func (m response_SessionService_GetSession_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetSessionResponse + return response.Item } type response_SessionService_CancelSession_0 struct { @@ -320,7 +328,8 @@ type response_SessionService_CancelSession_0 struct { } func (m response_SessionService_CancelSession_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CancelSessionResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go b/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go index 5f049c9e1..c219cf98e 100644 --- a/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go +++ b/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go @@ -41,7 +41,9 @@ func request_StorageBucketService_GetStorageBucket_0(ctx context.Context, marsha metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_StorageBucketService_ListStorageBuckets_0(ctx context.Context, mars protoReq ListStorageBucketsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -115,6 +119,9 @@ func request_StorageBucketService_CreateStorageBucket_0(ctx context.Context, mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -158,6 +165,9 @@ func request_StorageBucketService_UpdateStorageBucket_0(ctx context.Context, mar if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -227,7 +237,9 @@ func request_StorageBucketService_DeleteStorageBucket_0(ctx context.Context, mar metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -497,7 +509,8 @@ type response_StorageBucketService_GetStorageBucket_0 struct { } func (m response_StorageBucketService_GetStorageBucket_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetStorageBucketResponse + return response.Item } type response_StorageBucketService_CreateStorageBucket_0 struct { @@ -505,7 +518,8 @@ type response_StorageBucketService_CreateStorageBucket_0 struct { } func (m response_StorageBucketService_CreateStorageBucket_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateStorageBucketResponse + return response.Item } type response_StorageBucketService_UpdateStorageBucket_0 struct { @@ -513,7 +527,8 @@ type response_StorageBucketService_UpdateStorageBucket_0 struct { } func (m response_StorageBucketService_UpdateStorageBucket_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateStorageBucketResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/target_service.pb.gw.go b/internal/gen/controller/api/services/target_service.pb.gw.go index 563b0e763..5547c2fc2 100644 --- a/internal/gen/controller/api/services/target_service.pb.gw.go +++ b/internal/gen/controller/api/services/target_service.pb.gw.go @@ -41,7 +41,9 @@ func request_TargetService_GetTarget_0(ctx context.Context, marshaler runtime.Ma metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_TargetService_ListTargets_0(ctx context.Context, marshaler runtime. protoReq ListTargetsRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_TargetService_CreateTarget_0(ctx context.Context, marshaler runtime if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateTarget(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_TargetService_UpdateTarget_0(ctx context.Context, marshaler runtime if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_TargetService_DeleteTarget_0(ctx context.Context, marshaler runtime metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -253,6 +265,9 @@ func request_TargetService_AuthorizeSession_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -295,6 +310,9 @@ func request_TargetService_AddTargetHostSources_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -337,6 +355,9 @@ func request_TargetService_SetTargetHostSources_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -379,6 +400,9 @@ func request_TargetService_RemoveTargetHostSources_0(ctx context.Context, marsha if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -421,6 +445,9 @@ func request_TargetService_AddTargetCredentialSources_0(ctx context.Context, mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -463,6 +490,9 @@ func request_TargetService_SetTargetCredentialSources_0(ctx context.Context, mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -505,6 +535,9 @@ func request_TargetService_RemoveTargetCredentialSources_0(ctx context.Context, if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -1036,7 +1069,8 @@ type response_TargetService_GetTarget_0 struct { } func (m response_TargetService_GetTarget_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetTargetResponse + return response.Item } type response_TargetService_CreateTarget_0 struct { @@ -1044,7 +1078,8 @@ type response_TargetService_CreateTarget_0 struct { } func (m response_TargetService_CreateTarget_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateTargetResponse + return response.Item } type response_TargetService_UpdateTarget_0 struct { @@ -1052,7 +1087,8 @@ type response_TargetService_UpdateTarget_0 struct { } func (m response_TargetService_UpdateTarget_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateTargetResponse + return response.Item } type response_TargetService_AuthorizeSession_0 struct { @@ -1060,7 +1096,8 @@ type response_TargetService_AuthorizeSession_0 struct { } func (m response_TargetService_AuthorizeSession_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AuthorizeSessionResponse + return response.Item } type response_TargetService_AddTargetHostSources_0 struct { @@ -1068,7 +1105,8 @@ type response_TargetService_AddTargetHostSources_0 struct { } func (m response_TargetService_AddTargetHostSources_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddTargetHostSourcesResponse + return response.Item } type response_TargetService_SetTargetHostSources_0 struct { @@ -1076,7 +1114,8 @@ type response_TargetService_SetTargetHostSources_0 struct { } func (m response_TargetService_SetTargetHostSources_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetTargetHostSourcesResponse + return response.Item } type response_TargetService_RemoveTargetHostSources_0 struct { @@ -1084,7 +1123,8 @@ type response_TargetService_RemoveTargetHostSources_0 struct { } func (m response_TargetService_RemoveTargetHostSources_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveTargetHostSourcesResponse + return response.Item } type response_TargetService_AddTargetCredentialSources_0 struct { @@ -1092,7 +1132,8 @@ type response_TargetService_AddTargetCredentialSources_0 struct { } func (m response_TargetService_AddTargetCredentialSources_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddTargetCredentialSourcesResponse + return response.Item } type response_TargetService_SetTargetCredentialSources_0 struct { @@ -1100,7 +1141,8 @@ type response_TargetService_SetTargetCredentialSources_0 struct { } func (m response_TargetService_SetTargetCredentialSources_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetTargetCredentialSourcesResponse + return response.Item } type response_TargetService_RemoveTargetCredentialSources_0 struct { @@ -1108,7 +1150,8 @@ type response_TargetService_RemoveTargetCredentialSources_0 struct { } func (m response_TargetService_RemoveTargetCredentialSources_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveTargetCredentialSourcesResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/user_service.pb.gw.go b/internal/gen/controller/api/services/user_service.pb.gw.go index 4ee8437a7..a865f30c6 100644 --- a/internal/gen/controller/api/services/user_service.pb.gw.go +++ b/internal/gen/controller/api/services/user_service.pb.gw.go @@ -41,7 +41,9 @@ func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marsha metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_UserService_ListUsers_0(ctx context.Context, marshaler runtime.Mars protoReq ListUsersRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_UserService_CreateUser_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -144,6 +151,9 @@ func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Mar if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -213,7 +223,9 @@ func request_UserService_DeleteUser_0(ctx context.Context, marshaler runtime.Mar metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -253,6 +265,9 @@ func request_UserService_AddUserAccounts_0(ctx context.Context, marshaler runtim if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -295,6 +310,9 @@ func request_UserService_SetUserAccounts_0(ctx context.Context, marshaler runtim if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -337,6 +355,9 @@ func request_UserService_RemoveUserAccounts_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -378,7 +399,9 @@ func request_UserService_ListResolvableAliases_0(ctx context.Context, marshaler metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -808,7 +831,8 @@ type response_UserService_GetUser_0 struct { } func (m response_UserService_GetUser_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetUserResponse + return response.Item } type response_UserService_CreateUser_0 struct { @@ -816,7 +840,8 @@ type response_UserService_CreateUser_0 struct { } func (m response_UserService_CreateUser_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateUserResponse + return response.Item } type response_UserService_UpdateUser_0 struct { @@ -824,7 +849,8 @@ type response_UserService_UpdateUser_0 struct { } func (m response_UserService_UpdateUser_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateUserResponse + return response.Item } type response_UserService_AddUserAccounts_0 struct { @@ -832,7 +858,8 @@ type response_UserService_AddUserAccounts_0 struct { } func (m response_UserService_AddUserAccounts_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddUserAccountsResponse + return response.Item } type response_UserService_SetUserAccounts_0 struct { @@ -840,7 +867,8 @@ type response_UserService_SetUserAccounts_0 struct { } func (m response_UserService_SetUserAccounts_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetUserAccountsResponse + return response.Item } type response_UserService_RemoveUserAccounts_0 struct { @@ -848,7 +876,8 @@ type response_UserService_RemoveUserAccounts_0 struct { } func (m response_UserService_RemoveUserAccounts_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveUserAccountsResponse + return response.Item } var ( diff --git a/internal/gen/controller/api/services/worker_service.pb.gw.go b/internal/gen/controller/api/services/worker_service.pb.gw.go index 58c5103df..cfd9e2ccb 100644 --- a/internal/gen/controller/api/services/worker_service.pb.gw.go +++ b/internal/gen/controller/api/services/worker_service.pb.gw.go @@ -41,7 +41,9 @@ func request_WorkerService_GetWorker_0(ctx context.Context, marshaler runtime.Ma metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_WorkerService_ListWorkers_0(ctx context.Context, marshaler runtime. protoReq ListWorkersRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -113,6 +117,9 @@ func request_WorkerService_CreateWorkerLed_0(ctx context.Context, marshaler runt if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateWorkerLed(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -137,6 +144,9 @@ func request_WorkerService_CreateControllerLed_0(ctx context.Context, marshaler if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.CreateControllerLed(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -168,6 +178,9 @@ func request_WorkerService_UpdateWorker_0(ctx context.Context, marshaler runtime if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -237,7 +250,9 @@ func request_WorkerService_DeleteWorker_0(ctx context.Context, marshaler runtime metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -277,6 +292,9 @@ func request_WorkerService_AddWorkerTags_0(ctx context.Context, marshaler runtim if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -319,6 +337,9 @@ func request_WorkerService_SetWorkerTags_0(ctx context.Context, marshaler runtim if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -361,6 +382,9 @@ func request_WorkerService_RemoveWorkerTags_0(ctx context.Context, marshaler run if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -401,7 +425,9 @@ func request_WorkerService_ReadCertificateAuthority_0(ctx context.Context, marsh protoReq ReadCertificateAuthorityRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -434,7 +460,9 @@ func request_WorkerService_ReinitializeCertificateAuthority_0(ctx context.Contex protoReq ReinitializeCertificateAuthorityRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -921,7 +949,8 @@ type response_WorkerService_GetWorker_0 struct { } func (m response_WorkerService_GetWorker_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.GetWorkerResponse + return response.Item } type response_WorkerService_CreateWorkerLed_0 struct { @@ -929,7 +958,8 @@ type response_WorkerService_CreateWorkerLed_0 struct { } func (m response_WorkerService_CreateWorkerLed_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateWorkerLedResponse + return response.Item } type response_WorkerService_CreateControllerLed_0 struct { @@ -937,7 +967,8 @@ type response_WorkerService_CreateControllerLed_0 struct { } func (m response_WorkerService_CreateControllerLed_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.CreateControllerLedResponse + return response.Item } type response_WorkerService_UpdateWorker_0 struct { @@ -945,7 +976,8 @@ type response_WorkerService_UpdateWorker_0 struct { } func (m response_WorkerService_UpdateWorker_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.UpdateWorkerResponse + return response.Item } type response_WorkerService_AddWorkerTags_0 struct { @@ -953,7 +985,8 @@ type response_WorkerService_AddWorkerTags_0 struct { } func (m response_WorkerService_AddWorkerTags_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.AddWorkerTagsResponse + return response.Item } type response_WorkerService_SetWorkerTags_0 struct { @@ -961,7 +994,8 @@ type response_WorkerService_SetWorkerTags_0 struct { } func (m response_WorkerService_SetWorkerTags_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.SetWorkerTagsResponse + return response.Item } type response_WorkerService_RemoveWorkerTags_0 struct { @@ -969,7 +1003,8 @@ type response_WorkerService_RemoveWorkerTags_0 struct { } func (m response_WorkerService_RemoveWorkerTags_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.RemoveWorkerTagsResponse + return response.Item } type response_WorkerService_ReadCertificateAuthority_0 struct { @@ -977,7 +1012,8 @@ type response_WorkerService_ReadCertificateAuthority_0 struct { } func (m response_WorkerService_ReadCertificateAuthority_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.ReadCertificateAuthorityResponse + return response.Item } type response_WorkerService_ReinitializeCertificateAuthority_0 struct { @@ -985,7 +1021,8 @@ type response_WorkerService_ReinitializeCertificateAuthority_0 struct { } func (m response_WorkerService_ReinitializeCertificateAuthority_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.ReinitializeCertificateAuthorityResponse + return response.Item } var ( diff --git a/internal/gen/ops/services/health_service.pb.gw.go b/internal/gen/ops/services/health_service.pb.gw.go index 81a0103da..0636b6bf3 100644 --- a/internal/gen/ops/services/health_service.pb.gw.go +++ b/internal/gen/ops/services/health_service.pb.gw.go @@ -42,7 +42,9 @@ func request_HealthService_GetHealth_0(ctx context.Context, marshaler runtime.Ma protoReq GetHealthRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/internal/gen/testing/attribute/attribute.pb.gw.go b/internal/gen/testing/attribute/attribute.pb.gw.go index 3b7322663..c77f2c45a 100644 --- a/internal/gen/testing/attribute/attribute.pb.gw.go +++ b/internal/gen/testing/attribute/attribute.pb.gw.go @@ -40,7 +40,9 @@ func request_TestResourceService_TestListResource_0(ctx context.Context, marshal protoReq TestListResourceRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.TestListResource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -62,6 +64,9 @@ func request_TestResourceService_TestCreateResource_0(ctx context.Context, marsh if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.TestCreateResource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -93,6 +98,9 @@ func request_TestResourceService_TestUpdateResource_0(ctx context.Context, marsh if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Item); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 { if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Item); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -162,7 +170,9 @@ func request_TestResourceService_TestGetResource_0(ctx context.Context, marshale metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -395,7 +405,8 @@ type response_TestResourceService_TestCreateResource_0 struct { } func (m response_TestResourceService_TestCreateResource_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.TestCreateResourceResponse + return response.Item } type response_TestResourceService_TestUpdateResource_0 struct { @@ -403,7 +414,8 @@ type response_TestResourceService_TestUpdateResource_0 struct { } func (m response_TestResourceService_TestUpdateResource_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.TestUpdateResourceResponse + return response.Item } type response_TestResourceService_TestGetResource_0 struct { @@ -411,7 +423,8 @@ type response_TestResourceService_TestGetResource_0 struct { } func (m response_TestResourceService_TestGetResource_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.TestGetResourceResponse + return response.Item } var ( diff --git a/internal/gen/testing/event/event.pb.gw.go b/internal/gen/testing/event/event.pb.gw.go index 8bd5e2b77..07bffb745 100644 --- a/internal/gen/testing/event/event.pb.gw.go +++ b/internal/gen/testing/event/event.pb.gw.go @@ -44,6 +44,9 @@ func request_TestAuthMethodService_TestAuthenticate_0(ctx context.Context, marsh if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["auth_method_id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "auth_method_id") diff --git a/internal/gen/testing/protooptions/service.pb.gw.go b/internal/gen/testing/protooptions/service.pb.gw.go index 15fe1d71f..5082692d7 100644 --- a/internal/gen/testing/protooptions/service.pb.gw.go +++ b/internal/gen/testing/protooptions/service.pb.gw.go @@ -41,7 +41,9 @@ func request_TestService_TestMethod_0(ctx context.Context, marshaler runtime.Mar metadata runtime.ServerMetadata err error ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } val, ok := pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") @@ -79,7 +81,9 @@ func request_TestService_TestMethod_1(ctx context.Context, marshaler runtime.Mar protoReq TestMethodRequest metadata runtime.ServerMetadata ) - io.Copy(io.Discard, req.Body) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -233,7 +237,8 @@ type response_TestService_TestMethod_0 struct { } func (m response_TestService_TestMethod_0) XXX_ResponseBody() interface{} { - return m.Item + response := m.TestMethodResponse + return response.Item } var ( diff --git a/plugins/boundary/mains/azure/go.mod b/plugins/boundary/mains/azure/go.mod index 5e7bc9e4c..e1228d536 100644 --- a/plugins/boundary/mains/azure/go.mod +++ b/plugins/boundary/mains/azure/go.mod @@ -32,7 +32,7 @@ require ( github.com/hashicorp/go-kms-wrapping/v2 v2.0.18 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-plugin v1.6.3 // indirect - github.com/hashicorp/go-retryablehttp v0.7.7 // indirect + github.com/hashicorp/go-retryablehttp v0.7.8 // indirect github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 // indirect github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect github.com/hashicorp/go-secure-stdlib/pluginutil/v2 v2.0.8 // indirect diff --git a/plugins/boundary/mains/azure/go.sum b/plugins/boundary/mains/azure/go.sum index f1d0402fa..9d1b07212 100644 --- a/plugins/boundary/mains/azure/go.sum +++ b/plugins/boundary/mains/azure/go.sum @@ -182,8 +182,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg= github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0= github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= -github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48= +github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw= github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng= github.com/hashicorp/go-secure-stdlib/base62 v0.1.2/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw= github.com/hashicorp/go-secure-stdlib/configutil/v2 v2.0.11 h1:uPW2Wn0YlmI9RGSkZpcIplnVRwJ7BCiGpk1vnF2TMw4= diff --git a/plugins/kms/mains/transit/go.mod b/plugins/kms/mains/transit/go.mod index 1ea57079e..5ca3af263 100644 --- a/plugins/kms/mains/transit/go.mod +++ b/plugins/kms/mains/transit/go.mod @@ -19,7 +19,7 @@ require ( github.com/hashicorp/go-kms-wrapping/v2 v2.0.18 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-plugin v1.6.3 // indirect - github.com/hashicorp/go-retryablehttp v0.7.7 // indirect + github.com/hashicorp/go-retryablehttp v0.7.8 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 // indirect github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect diff --git a/plugins/kms/mains/transit/go.sum b/plugins/kms/mains/transit/go.sum index 750cbe6b1..685a5d96c 100644 --- a/plugins/kms/mains/transit/go.sum +++ b/plugins/kms/mains/transit/go.sum @@ -39,8 +39,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg= github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0= -github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= -github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48= +github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng= diff --git a/sdk/go.mod b/sdk/go.mod index 280581475..c38f6395b 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -3,7 +3,7 @@ module github.com/hashicorp/boundary/sdk go 1.24.0 require ( - github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 github.com/hashicorp/eventlogger v0.2.11 github.com/hashicorp/eventlogger/filters/encrypt v0.1.8-0.20231025104552-802587e608f0 github.com/hashicorp/go-hclog v1.6.3 @@ -14,7 +14,7 @@ require ( github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 github.com/hashicorp/hcl v1.0.0 github.com/stretchr/testify v1.10.0 - google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 + google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 google.golang.org/grpc v1.73.0 google.golang.org/protobuf v1.36.6 nhooyr.io/websocket v1.8.17 @@ -62,6 +62,6 @@ require ( golang.org/x/net v0.41.0 // indirect golang.org/x/sys v0.33.0 // indirect golang.org/x/text v0.26.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/sdk/go.sum b/sdk/go.sum index 1b7f7c941..010f70d77 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -31,8 +31,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 h1:+epNPbD5EqgpEMm5wrl4Hqts3jZt8+kYaqUisuuIGTk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -190,10 +190,10 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 h1:hE3bRWtU6uceqlh4fhrSnUyjKHMKB9KrTLLG+bc0ddM= -google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463/go.mod h1:U90ffi8eUL9MwPcrJylN5+Mk2v3vuPDptd5yyNUiRR8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY= +google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok= google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc= google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=