From 23194ad5e9a501cb561c331800d63432d9701682 Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Wed, 29 Nov 2023 11:13:13 +0400 Subject: [PATCH] feat: add status to tailnet mapping query --- coderd/database/queries.sql.go | 14 ++++++++------ coderd/database/queries/tailnet.sql | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 254515c00811a..3604b7a58d0b1 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -4954,22 +4954,23 @@ func (q *sqlQuerier) GetTailnetPeers(ctx context.Context, id uuid.UUID) ([]Tailn } const getTailnetTunnelPeerBindings = `-- name: GetTailnetTunnelPeerBindings :many -SELECT tailnet_tunnels.dst_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node +SELECT tailnet_tunnels.dst_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node, tailnet_peers.status FROM tailnet_tunnels INNER JOIN tailnet_peers ON tailnet_tunnels.dst_id = tailnet_peers.id WHERE tailnet_tunnels.src_id = $1 UNION -SELECT tailnet_tunnels.src_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node +SELECT tailnet_tunnels.src_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node, tailnet_peers.status FROM tailnet_tunnels INNER JOIN tailnet_peers ON tailnet_tunnels.src_id = tailnet_peers.id WHERE tailnet_tunnels.dst_id = $1 ` type GetTailnetTunnelPeerBindingsRow struct { - PeerID uuid.UUID `db:"peer_id" json:"peer_id"` - CoordinatorID uuid.UUID `db:"coordinator_id" json:"coordinator_id"` - UpdatedAt time.Time `db:"updated_at" json:"updated_at"` - Node []byte `db:"node" json:"node"` + PeerID uuid.UUID `db:"peer_id" json:"peer_id"` + CoordinatorID uuid.UUID `db:"coordinator_id" json:"coordinator_id"` + UpdatedAt time.Time `db:"updated_at" json:"updated_at"` + Node []byte `db:"node" json:"node"` + Status TailnetStatus `db:"status" json:"status"` } func (q *sqlQuerier) GetTailnetTunnelPeerBindings(ctx context.Context, srcID uuid.UUID) ([]GetTailnetTunnelPeerBindingsRow, error) { @@ -4986,6 +4987,7 @@ func (q *sqlQuerier) GetTailnetTunnelPeerBindings(ctx context.Context, srcID uui &i.CoordinatorID, &i.UpdatedAt, &i.Node, + &i.Status, ); err != nil { return nil, err } diff --git a/coderd/database/queries/tailnet.sql b/coderd/database/queries/tailnet.sql index 6128c944f9619..95b7dff56b475 100644 --- a/coderd/database/queries/tailnet.sql +++ b/coderd/database/queries/tailnet.sql @@ -190,12 +190,12 @@ FROM tailnet_tunnels WHERE tailnet_tunnels.dst_id = $1; -- name: GetTailnetTunnelPeerBindings :many -SELECT tailnet_tunnels.dst_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node +SELECT tailnet_tunnels.dst_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node, tailnet_peers.status FROM tailnet_tunnels INNER JOIN tailnet_peers ON tailnet_tunnels.dst_id = tailnet_peers.id WHERE tailnet_tunnels.src_id = $1 UNION -SELECT tailnet_tunnels.src_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node +SELECT tailnet_tunnels.src_id as peer_id, tailnet_peers.coordinator_id, tailnet_peers.updated_at, tailnet_peers.node, tailnet_peers.status FROM tailnet_tunnels INNER JOIN tailnet_peers ON tailnet_tunnels.src_id = tailnet_peers.id WHERE tailnet_tunnels.dst_id = $1;