Skip to content

Agent Mesh

Address review comments

Antonio Ojead8ee98b3cb17
diff --git a/internal/storage/sql_store.go b/internal/storage/sql_store.go
index 282c6b85..4f9a38fb 100644
--- a/internal/storage/sql_store.go
+++ b/internal/storage/sql_store.go
@@ -678,6 +678,7 @@ func (s *SQLStore) ListNodes(ctx context.Context) ([]EnrolledNode, error) {
var nodes []EnrolledNode
for rows.Next() {
var node EnrolledNode
+ var claimsJSON sql.NullString
var enrolledAtUnix, expiresAtUnix int64
err := rows.Scan(
&node.PeerID,
@@ -685,7 +686,7 @@ func (s *SQLStore) ListNodes(ctx context.Context) ([]EnrolledNode, error) {
&node.Biscuit,
&node.Role,
&node.EnrollmentType,
- &node.ClaimsJSON,
+ &claimsJSON,
&enrolledAtUnix,
&expiresAtUnix,
&node.Banned,
@@ -693,6 +694,9 @@ func (s *SQLStore) ListNodes(ctx context.Context) ([]EnrolledNode, error) {
if err != nil {
return nil, fmt.Errorf("failed to scan enrolled node: %w", err)
}
+ if claimsJSON.Valid {
+ node.ClaimsJSON = claimsJSON.String
+ }
node.EnrolledAt = time.UnixMilli(enrolledAtUnix)
node.ExpiresAt = time.UnixMilli(expiresAtUnix)
nodes = append(nodes, node)
@@ -715,6 +719,7 @@ func (s *SQLStore) ListBootstrapTokens(ctx context.Context) ([]BootstrapToken, e
var tokens []BootstrapToken
for rows.Next() {
var t BootstrapToken
+ var desc sql.NullString
var created, expires int64
err := rows.Scan(
&t.ID,
@@ -722,13 +727,16 @@ func (s *SQLStore) ListBootstrapTokens(ctx context.Context) ([]BootstrapToken, e
&t.Role,
&t.MaxUsages,
&t.UsagesCount,
- &t.Description,
+ &desc,
&created,
&expires,
)
if err != nil {
return nil, fmt.Errorf("failed to scan bootstrap token: %w", err)
}
+ if desc.Valid {
+ t.Description = desc.String
+ }
t.CreatedAt = time.Unix(created, 0)
t.ExpiresAt = time.Unix(expires, 0)
tokens = append(tokens, t)