Skip to content

Commit 7dabdbd

Browse files
committed
style(format code): update changeIPAddress function name
1 parent b5f8781 commit 7dabdbd

File tree

7 files changed

+312
-323
lines changed

7 files changed

+312
-323
lines changed

gen/go/headscale/v1/headscale.pb.go

Lines changed: 247 additions & 253 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/headscale.pb.gw.go

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/headscale_grpc.pb.go

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/openapiv2/headscale/v1/headscale.swagger.json

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -320,14 +320,15 @@
320320
]
321321
}
322322
},
323-
"/api/v1/node/{nodeId}/expire": {
324-
"post": {
325-
"operationId": "HeadscaleService_ExpireNode",
323+
"/api/v1/node/{nodeId}/changeIPAddress/{newIp}": {
324+
"put": {
325+
"summary": "update IP",
326+
"operationId": "HeadscaleService_ChangeIPAddress",
326327
"responses": {
327328
"200": {
328329
"description": "A successful response.",
329330
"schema": {
330-
"$ref": "#/definitions/v1ExpireNodeResponse"
331+
"$ref": "#/definitions/v1UpdateIPAddressResponse"
331332
}
332333
},
333334
"default": {
@@ -344,22 +345,36 @@
344345
"required": true,
345346
"type": "string",
346347
"format": "uint64"
348+
},
349+
{
350+
"name": "newIp",
351+
"description": "new IP address",
352+
"in": "path",
353+
"required": true,
354+
"type": "string"
355+
},
356+
{
357+
"name": "body",
358+
"in": "body",
359+
"required": true,
360+
"schema": {
361+
"type": "object"
362+
}
347363
}
348364
],
349365
"tags": [
350366
"HeadscaleService"
351367
]
352368
}
353369
},
354-
"/api/v1/node/{nodeId}/ip/{newIp}": {
355-
"put": {
356-
"summary": "update IP",
357-
"operationId": "HeadscaleService_UpdateIP",
370+
"/api/v1/node/{nodeId}/expire": {
371+
"post": {
372+
"operationId": "HeadscaleService_ExpireNode",
358373
"responses": {
359374
"200": {
360375
"description": "A successful response.",
361376
"schema": {
362-
"$ref": "#/definitions/v1UpdateIPResponse"
377+
"$ref": "#/definitions/v1ExpireNodeResponse"
363378
}
364379
},
365380
"default": {
@@ -376,21 +391,6 @@
376391
"required": true,
377392
"type": "string",
378393
"format": "uint64"
379-
},
380-
{
381-
"name": "newIp",
382-
"description": "new IP address",
383-
"in": "path",
384-
"required": true,
385-
"type": "string"
386-
},
387-
{
388-
"name": "body",
389-
"in": "body",
390-
"required": true,
391-
"schema": {
392-
"type": "object"
393-
}
394394
}
395395
],
396396
"tags": [
@@ -1486,14 +1486,11 @@
14861486
}
14871487
}
14881488
},
1489-
"v1UpdateIPResponse": {
1489+
"v1UpdateIPAddressResponse": {
14901490
"type": "object",
14911491
"properties": {
14921492
"node": {
14931493
"$ref": "#/definitions/v1Node"
1494-
},
1495-
"newIp": {
1496-
"type": "string"
14971494
}
14981495
}
14991496
},

hscontrol/db/ip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (i *IPAllocator) Next() (*netip.Addr, *netip.Addr, error) {
156156
return ret4, ret6, nil
157157
}
158158

159-
func (i *IPAllocator) Update(node *types.Node, IP netip.Addr) bool {
159+
func (i *IPAllocator) UpdateUsedIP(node *types.Node, IP netip.Addr) bool {
160160
i.mu.Lock()
161161
defer i.mu.Unlock()
162162

hscontrol/grpcv1.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ func (api headscaleV1APIServer) DebugCreateNode(
872872
return &v1.DebugCreateNodeResponse{Node: newNode.Proto()}, nil
873873
}
874874

875-
func (api headscaleV1APIServer) UpdateIP(_ context.Context, req *v1.UpdateIPRequest) (*v1.UpdateIPResponse, error) {
875+
func (api headscaleV1APIServer) ChangeIPAddress(ctx context.Context, req *v1.UpdateIPAddressRequest) (*v1.UpdateIPAddressResponse, error) {
876876

877877
var (
878878
IP netip.Addr
@@ -890,7 +890,7 @@ func (api headscaleV1APIServer) UpdateIP(_ context.Context, req *v1.UpdateIPRequ
890890
if node, err := api.h.db.GetNodeByID(types.NodeID(req.NodeId)); node != nil {
891891
var newNode *types.Node
892892

893-
if changed := api.h.ipAlloc.Update(node, IP); !changed {
893+
if changed := api.h.ipAlloc.UpdateUsedIP(node, IP); !changed {
894894
return nil, fmt.Errorf("prefix error")
895895
}
896896

@@ -905,9 +905,8 @@ func (api headscaleV1APIServer) UpdateIP(_ context.Context, req *v1.UpdateIPRequ
905905
Message: "IP address updated",
906906
}, node.ID)
907907

908-
return &v1.UpdateIPResponse{
909-
NewIp: IP.String(),
910-
Node: newNode.Proto(),
908+
return &v1.UpdateIPAddressResponse{
909+
Node: newNode.Proto(),
911910
}, nil
912911

913912
} else {

proto/headscale/v1/headscale.proto

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ service HeadscaleService {
212212

213213

214214
// update IP
215-
rpc UpdateIP(UpdateIPRequest) returns (UpdateIPResponse) {
215+
rpc ChangeIPAddress(UpdateIPAddressRequest) returns (UpdateIPAddressResponse) {
216216
option (google.api.http) = {
217-
put : "/api/v1/node/{node_id}/ip/{new_ip}"
217+
put : "/api/v1/node/{node_id}/changeIPAddress/{new_ip}"
218218
body : "*"
219219
};
220220
}
@@ -248,12 +248,11 @@ service HeadscaleService {
248248
// }
249249
}
250250

251-
message UpdateIPRequest {
251+
message UpdateIPAddressRequest {
252252
uint64 node_id = 1;
253253
string new_ip = 2; // new IP address
254254
}
255255

256-
message UpdateIPResponse {
256+
message UpdateIPAddressResponse {
257257
Node node = 1;
258-
string new_ip =2;
259258
}

0 commit comments

Comments
 (0)