From 8631581852266a3720cd80fd37904e5e6c6fba3e Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Wed, 7 Jan 2026 13:35:44 +0100 Subject: [PATCH] gen: regenerate proto code --- gen/go/headscale/v1/headscale.pb.gw.go | 14 ----- gen/go/headscale/v1/preauthkey.pb.go | 55 +++++-------------- .../headscale/v1/headscale.swagger.json | 22 +------- 3 files changed, 16 insertions(+), 75 deletions(-) diff --git a/gen/go/headscale/v1/headscale.pb.gw.go b/gen/go/headscale/v1/headscale.pb.gw.go index ffa6964f..8ef7d88c 100644 --- a/gen/go/headscale/v1/headscale.pb.gw.go +++ b/gen/go/headscale/v1/headscale.pb.gw.go @@ -259,19 +259,11 @@ func local_request_HeadscaleService_DeletePreAuthKey_0(ctx context.Context, mars return msg, metadata, err } -var filter_HeadscaleService_ListPreAuthKeys_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} - func request_HeadscaleService_ListPreAuthKeys_0(ctx context.Context, marshaler runtime.Marshaler, client HeadscaleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( protoReq ListPreAuthKeysRequest metadata runtime.ServerMetadata ) - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_HeadscaleService_ListPreAuthKeys_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } msg, err := client.ListPreAuthKeys(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -281,12 +273,6 @@ func local_request_HeadscaleService_ListPreAuthKeys_0(ctx context.Context, marsh protoReq ListPreAuthKeysRequest metadata runtime.ServerMetadata ) - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_HeadscaleService_ListPreAuthKeys_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } msg, err := server.ListPreAuthKeys(ctx, &protoReq) return msg, metadata, err } diff --git a/gen/go/headscale/v1/preauthkey.pb.go b/gen/go/headscale/v1/preauthkey.pb.go index 216b17c6..ff902d45 100644 --- a/gen/go/headscale/v1/preauthkey.pb.go +++ b/gen/go/headscale/v1/preauthkey.pb.go @@ -252,8 +252,7 @@ func (x *CreatePreAuthKeyResponse) GetPreAuthKey() *PreAuthKey { type ExpirePreAuthKeyRequest struct { state protoimpl.MessageState `protogen:"open.v1"` - User uint64 `protobuf:"varint,1,opt,name=user,proto3" json:"user,omitempty"` - Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -288,20 +287,13 @@ func (*ExpirePreAuthKeyRequest) Descriptor() ([]byte, []int) { return file_headscale_v1_preauthkey_proto_rawDescGZIP(), []int{3} } -func (x *ExpirePreAuthKeyRequest) GetUser() uint64 { +func (x *ExpirePreAuthKeyRequest) GetId() uint64 { if x != nil { - return x.User + return x.Id } return 0 } -func (x *ExpirePreAuthKeyRequest) GetKey() string { - if x != nil { - return x.Key - } - return "" -} - type ExpirePreAuthKeyResponse struct { state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields @@ -340,8 +332,7 @@ func (*ExpirePreAuthKeyResponse) Descriptor() ([]byte, []int) { type DeletePreAuthKeyRequest struct { state protoimpl.MessageState `protogen:"open.v1"` - User uint64 `protobuf:"varint,1,opt,name=user,proto3" json:"user,omitempty"` - Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -376,20 +367,13 @@ func (*DeletePreAuthKeyRequest) Descriptor() ([]byte, []int) { return file_headscale_v1_preauthkey_proto_rawDescGZIP(), []int{5} } -func (x *DeletePreAuthKeyRequest) GetUser() uint64 { +func (x *DeletePreAuthKeyRequest) GetId() uint64 { if x != nil { - return x.User + return x.Id } return 0 } -func (x *DeletePreAuthKeyRequest) GetKey() string { - if x != nil { - return x.Key - } - return "" -} - type DeletePreAuthKeyResponse struct { state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields @@ -428,7 +412,6 @@ func (*DeletePreAuthKeyResponse) Descriptor() ([]byte, []int) { type ListPreAuthKeysRequest struct { state protoimpl.MessageState `protogen:"open.v1"` - User uint64 `protobuf:"varint,1,opt,name=user,proto3" json:"user,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -463,13 +446,6 @@ func (*ListPreAuthKeysRequest) Descriptor() ([]byte, []int) { return file_headscale_v1_preauthkey_proto_rawDescGZIP(), []int{7} } -func (x *ListPreAuthKeysRequest) GetUser() uint64 { - if x != nil { - return x.User - } - return 0 -} - type ListPreAuthKeysResponse struct { state protoimpl.MessageState `protogen:"open.v1"` PreAuthKeys []*PreAuthKey `protobuf:"bytes,1,rep,name=pre_auth_keys,json=preAuthKeys,proto3" json:"pre_auth_keys,omitempty"` @@ -543,17 +519,14 @@ const file_headscale_v1_preauthkey_proto_rawDesc = "" + "\bacl_tags\x18\x05 \x03(\tR\aaclTags\"V\n" + "\x18CreatePreAuthKeyResponse\x12:\n" + "\fpre_auth_key\x18\x01 \x01(\v2\x18.headscale.v1.PreAuthKeyR\n" + - "preAuthKey\"?\n" + - "\x17ExpirePreAuthKeyRequest\x12\x12\n" + - "\x04user\x18\x01 \x01(\x04R\x04user\x12\x10\n" + - "\x03key\x18\x02 \x01(\tR\x03key\"\x1a\n" + - "\x18ExpirePreAuthKeyResponse\"?\n" + - "\x17DeletePreAuthKeyRequest\x12\x12\n" + - "\x04user\x18\x01 \x01(\x04R\x04user\x12\x10\n" + - "\x03key\x18\x02 \x01(\tR\x03key\"\x1a\n" + - "\x18DeletePreAuthKeyResponse\",\n" + - "\x16ListPreAuthKeysRequest\x12\x12\n" + - "\x04user\x18\x01 \x01(\x04R\x04user\"W\n" + + "preAuthKey\")\n" + + "\x17ExpirePreAuthKeyRequest\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x04R\x02id\"\x1a\n" + + "\x18ExpirePreAuthKeyResponse\")\n" + + "\x17DeletePreAuthKeyRequest\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x04R\x02id\"\x1a\n" + + "\x18DeletePreAuthKeyResponse\"\x18\n" + + "\x16ListPreAuthKeysRequest\"W\n" + "\x17ListPreAuthKeysResponse\x12<\n" + "\rpre_auth_keys\x18\x01 \x03(\v2\x18.headscale.v1.PreAuthKeyR\vpreAuthKeysB)Z'github.com/juanfont/headscale/gen/go/v1b\x06proto3" diff --git a/gen/openapiv2/headscale/v1/headscale.swagger.json b/gen/openapiv2/headscale/v1/headscale.swagger.json index 4116349a..4127fb6e 100644 --- a/gen/openapiv2/headscale/v1/headscale.swagger.json +++ b/gen/openapiv2/headscale/v1/headscale.swagger.json @@ -566,15 +566,6 @@ } } }, - "parameters": [ - { - "name": "user", - "in": "query", - "required": false, - "type": "string", - "format": "uint64" - } - ], "tags": [ "HeadscaleService" ] @@ -597,17 +588,11 @@ }, "parameters": [ { - "name": "user", + "name": "id", "in": "query", "required": false, "type": "string", "format": "uint64" - }, - { - "name": "key", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -1044,12 +1029,9 @@ "v1ExpirePreAuthKeyRequest": { "type": "object", "properties": { - "user": { + "id": { "type": "string", "format": "uint64" - }, - "key": { - "type": "string" } } },