feat: destinations list status/last seen

infrahq · Jul 6, 2022 · 6b6cfaa · 6b6cfaa
1 parent b432fe0
commit 6b6cfaa
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/api/destination.go b/api/destination.go
@@ -15,7 +15,8 @@ type Destination struct {
 	Resources []string `json:"resources"`
 	Roles     []string `json:"roles"`
 
-	LastSeen Time `json:"lastSeen"`
+	LastSeen  Time `json:"lastSeen"`
+	Connected bool `json:"connected"`
 }
 
 type DestinationConnection struct {

diff --git a/internal/cmd/destinations.go b/internal/cmd/destinations.go
@@ -10,6 +10,11 @@ import (
 	"github.com/infrahq/infra/internal/logging"
 )
 
+const (
+	DestinationStatusConnected    = "Connected"
+	DestinationStatusDisconnected = "Disconnected"
+)
+
 func newDestinationsCmd(cli *CLI) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "destinations",
@@ -58,15 +63,24 @@ func newDestinationsListCmd(cli *CLI) *cobra.Command {
 				cli.Output(string(jsonOutput))
 			default:
 				type row struct {
-					Name string `header:"NAME"`
-					URL  string `header:"URL"`
+					Name     string `header:"NAME"`
+					URL      string `header:"URL"`
+					Status   string `header:"STATUS"`
+					LastSeen string `header:"LAST SEEN"`
 				}
 
 				var rows []row
 				for _, d := range destinations.Items {
+					status := DestinationStatusDisconnected
+					if d.Connected {
+						status = DestinationStatusConnected
+					}
+
 					rows = append(rows, row{
-						Name: d.Name,
-						URL:  d.Connection.URL,
+						Name:     d.Name,
+						URL:      d.Connection.URL,
+						Status:   status,
+						LastSeen: HumanTime(d.LastSeen.Time(), "never"),
 					})
 				}
 				if len(rows) > 0 {

diff --git a/internal/server/handlers_test.go b/internal/server/handlers_test.go
@@ -1401,6 +1401,7 @@ func TestAPI_CreateDestination(t *testing.T) {
 		"url": "cluster.production.example",
 		"ca": "-----BEGIN CERTIFICATE-----\nok\n-----END CERTIFICATE-----\n"
 	},
+	"connected": false,
 	"lastSeen": null,
 	"resources": ["res1", "res2"],
 	"roles": ["role1", "role2"],

diff --git a/internal/server/models/destination.go b/internal/server/models/destination.go
@@ -21,6 +21,13 @@ type Destination struct {
 }
 
 func (d *Destination) ToAPI() *api.Destination {
+	connected := false
+	// TODO: this should be configurable
+	// https://github.com/infrahq/infra/issues/2505
+	if time.Since(d.LastSeenAt) < 5*time.Minute {
+		connected = true
+	}
+
 	return &api.Destination{
 		ID:       d.ID,
 		Created:  api.Time(d.CreatedAt),
@@ -34,5 +41,6 @@ func (d *Destination) ToAPI() *api.Destination {
 		Resources: d.Resources,
 		Roles:     d.Roles,
 		LastSeen:  api.Time(d.LastSeenAt),
+		Connected: connected,
 	}
 }
diff --git a/internal/server/testdata/openapi3.json b/internal/server/testdata/openapi3.json
@@ -82,6 +82,9 @@
       },
       "Destination": {
         "properties": {
+          "connected": {
+            "type": "boolean"
+          },
           "connection": {
             "properties": {
               "ca": {
@@ -332,6 +335,9 @@
           "items": {
             "items": {
               "properties": {
+                "connected": {
+                  "type": "boolean"
+                },
                 "connection": {
                   "properties": {
                     "ca": {