devices: add connectedToControl field on device resource

Updates tailscale/corp#31905

Signed-off-by: mcoulombe <[email protected]>

Author: mcoulombe

devices.go

@@ -83,6 +83,7 @@ type Device struct {
 	Hostname                  string   `json:"hostname"`
 	IsEphemeral               bool     `json:"isEphemeral"`
 	IsExternal                bool     `json:"isExternal"`
+	ConnectedToControl        bool     `json:"connectedToControl"`
 	LastSeen                  Time     `json:"lastSeen"`
 	MachineKey                string   `json:"machineKey"`
 	NodeKey                   string   `json:"nodeKey"`

devices_test.go

@@ -57,6 +57,7 @@ func TestClient_Devices_Get(t *testing.T) {
 		Expires:                   Time{time.Date(2022, 8, 9, 11, 50, 23, 0, time.UTC)},
 		Hostname:                  "test",
 		IsExternal:                false,
+		ConnectedToControl:        false,
 		LastSeen:                  Time{time.Date(2022, 3, 9, 20, 3, 42, 0, time.UTC)},
 		MachineKey:                "mkey:test",
 		NodeKey:                   "nodekey:test",
@@ -165,6 +166,7 @@ func TestClient_Devices_List(t *testing.T) {
 				Hostname:                  "test",
 				IsEphemeral:               false,
 				IsExternal:                false,
+				ConnectedToControl:        false,
 				LastSeen:                  Time{time.Date(2022, 3, 9, 20, 3, 42, 0, time.UTC)},
 				MachineKey:                "mkey:test",
 				NodeKey:                   "nodekey:test",
@@ -233,12 +235,13 @@ func TestDevices_Unmarshal(t *testing.T) {
 					Expires: Time{
 						time.Date(1, 1, 1, 00, 00, 00, 0, time.UTC),
 					},
-					Hostname:          "hello",
-					ID:                "50052",
-					NodeID:            "nTESTJ30",
-					IsEphemeral:       false,
-					IsExternal:        true,
-					KeyExpiryDisabled: true,
+					Hostname:           "hello",
+					ID:                 "50052",
+					NodeID:             "nTESTJ30",
+					IsEphemeral:        false,
+					IsExternal:         true,
+					KeyExpiryDisabled:  true,
+					ConnectedToControl: false,
 					LastSeen: Time{
 						time.Date(2022, 4, 15, 13, 24, 40, 0, time.UTC),
 					},
@@ -260,12 +263,13 @@ func TestDevices_Unmarshal(t *testing.T) {
 					Expires: Time{
 						time.Date(2022, 9, 1, 17, 10, 27, 0, time.UTC),
 					},
-					Hostname:          "foo",
-					ID:                "50053",
-					NodeID:            "nTESTJ31",
-					IsEphemeral:       true,
-					IsExternal:        false,
-					KeyExpiryDisabled: true,
+					Hostname:           "foo",
+					ID:                 "50053",
+					NodeID:             "nTESTJ31",
+					IsEphemeral:        true,
+					IsExternal:         false,
+					KeyExpiryDisabled:  true,
+					ConnectedToControl: false,
 					LastSeen: Time{
 						time.Date(2022, 4, 15, 13, 25, 21, 0, time.UTC),
 					},
@@ -276,6 +280,31 @@ func TestDevices_Unmarshal(t *testing.T) {
 					UpdateAvailable: false,
 					User:            "[email protected]",
 				},
+				{
+					Addresses:                 []string{"100.69.123.1", "fd7a:115c:a1e0:ab12:4843:cd96:6265:e618"},
+					Authorized:                true,
+					BlocksIncomingConnections: false,
+					ClientVersion:             "1.22.2-t60b671955-gecc5d9846",
+					Created: Time{
+						time.Date(2022, 3, 5, 17, 10, 27, 0, time.UTC),
+					},
+					Expires: Time{
+						time.Date(2022, 9, 1, 17, 10, 27, 0, time.UTC),
+					},
+					Hostname:           "foo",
+					ID:                 "50053",
+					NodeID:             "nTESTJ31",
+					IsEphemeral:        true,
+					IsExternal:         false,
+					KeyExpiryDisabled:  true,
+					ConnectedToControl: true,
+					MachineKey:         "mkey:30dc3c061ac8b33fdc6d88a4a67b053b01b56930d78cae0cf7a164411d424c0d",
+					Name:               "foo.example.com",
+					NodeKey:            "nodekey:30dc3c061ac8b33fdc6d88a4a67b053b01b56930d78cae0cf7a164411d424c0d",
+					OS:                 "linux",
+					UpdateAvailable:    false,
+					User:               "[email protected]",
+				},
 			},
 		},
 	}

testdata/devices.json

@@ -16,6 +16,7 @@
       "isEphemeral": false,
       "isExternal": true,
       "keyExpiryDisabled": true,
+      "connectedToControl": false,
       "lastSeen": "2022-04-15T13:24:40Z",
       "machineKey": "",
       "name": "hello.example.com",
@@ -40,13 +41,38 @@
       "isEphemeral": true,
       "isExternal": false,
       "keyExpiryDisabled": true,
+      "connectedToControl": false,
       "lastSeen": "2022-04-15T13:25:21Z",
       "machineKey": "mkey:30dc3c061ac8b33fdc6d88a4a67b053b01b56930d78cae0cf7a164411d424c0d",
       "name": "foo.example.com",
       "nodeKey": "nodekey:30dc3c061ac8b33fdc6d88a4a67b053b01b56930d78cae0cf7a164411d424c0d",
       "os": "linux",
       "updateAvailable": false,
       "user": "[email protected]"
+    },
+    {
+      "addresses": [
+        "100.69.123.1",
+        "fd7a:115c:a1e0:ab12:4843:cd96:6265:e618"
+      ],
+      "authorized": true,
+      "blocksIncomingConnections": false,
+      "clientVersion": "1.22.2-t60b671955-gecc5d9846",
+      "created": "2022-03-05T17:10:27Z",
+      "expires": "2022-09-01T17:10:27Z",
+      "hostname": "foo",
+      "id": "50053",
+      "nodeId": "nTESTJ31",
+      "isEphemeral": true,
+      "isExternal": false,
+      "keyExpiryDisabled": true,
+      "connectedToControl": true,
+      "machineKey": "mkey:30dc3c061ac8b33fdc6d88a4a67b053b01b56930d78cae0cf7a164411d424c0d",
+      "name": "foo.example.com",
+      "nodeKey": "nodekey:30dc3c061ac8b33fdc6d88a4a67b053b01b56930d78cae0cf7a164411d424c0d",
+      "os": "linux",
+      "updateAvailable": false,
+      "user": "[email protected]"
     }
   ]
 }