Merge master

proto/headscale/v1/headscale.proto

@@ -81,6 +81,13 @@ service HeadscaleService {
         };
     }
 
+    rpc SetTags(SetTagsRequest) returns (SetTagsResponse) {
+        option (google.api.http) = {
+            post: "/api/v1/machine/{machine_id}/tags"
+            body: "*"
+        };
+    }
+
     rpc RegisterMachine(RegisterMachineRequest) returns (RegisterMachineResponse) {
         option (google.api.http) = {
             post: "/api/v1/machine/register"
@@ -110,6 +117,12 @@ service HeadscaleService {
             get: "/api/v1/machine"
         };
     }
+
+    rpc MoveMachine(MoveMachineRequest) returns (MoveMachineResponse) {
+        option (google.api.http) = {
+            post: "/api/v1/machine/{machine_id}/namespace"
+        };
+    }
     // --- Machine end ---
 
     // --- Route start ---

proto/headscale/v1/machine.proto

@@ -22,7 +22,6 @@ message Machine {
     string          name         = 6;
     Namespace namespace          = 7;
 
-
     google.protobuf.Timestamp last_seen              = 8;
     google.protobuf.Timestamp last_successful_update = 9;
     google.protobuf.Timestamp expiry                 = 10;
@@ -32,6 +31,8 @@ message Machine {
     google.protobuf.Timestamp created_at = 12;
 
     RegisterMethod register_method = 13;
+
+    reserved 14 to 17;
     // google.protobuf.Timestamp updated_at = 14;
     // google.protobuf.Timestamp deleted_at = 15;
 
@@ -39,7 +40,10 @@ message Machine {
     // bytes endpoints      = 16;
     // bytes enabled_routes = 17;
 
-    string          given_name     = 18;
+    repeated string forced_tags  = 18;
+    repeated string invalid_tags = 19;
+    repeated string valid_tags   = 20;
+    string          given_name   = 21;
 }
 
 message RegisterMachineRequest {
@@ -59,6 +63,15 @@ message GetMachineResponse {
     Machine machine = 1;
 }
 
+message SetTagsRequest {
+    uint64          machine_id = 1;
+    repeated string tags       = 2;
+}
+
+message SetTagsResponse {
+    Machine machine = 1;
+}
+
 message DeleteMachineRequest {
     uint64 machine_id = 1;
 }
@@ -76,7 +89,7 @@ message ExpireMachineResponse {
 
 message RenameMachineRequest {
     uint64 machine_id = 1;
-    string new_name = 2;
+    string new_name   = 2;
 }
 
 message RenameMachineResponse {
@@ -91,6 +104,15 @@ message ListMachinesResponse {
     repeated Machine machines = 1;
 }
 
+message MoveMachineRequest {
+    uint64 machine_id = 1;
+    string namespace  = 2;
+}
+
+message MoveMachineResponse {
+    Machine machine = 1;
+}
+
 message DebugCreateMachineRequest {
     string namespace       = 1;
     string          key    = 2;