Use attributes map to store os.

Signed-off-by: Shishir Mahajan <smahajan@roblox.com>
shishir-a412ed · Apr 6, 2022 · 3785155 · 3785155
1 parent 9b07048
commit 3785155
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/api/nodes.go b/api/nodes.go
@@ -906,7 +906,7 @@ func (v *StatValue) String() string {
 type NodeListStub struct {
 	Address               string
 	ID                    string
-	OS                    string
+	Attributes            map[string]string
 	Datacenter            string
 	Name                  string
 	NodeClass             string

diff --git a/command/node_status.go b/command/node_status.go
@@ -238,7 +238,7 @@ func (c *NodeStatusCommand) Run(args []string) int {
 				node.Name,
 				node.NodeClass)
 			if c.os {
-				out[i+1] += fmt.Sprintf("|%s", node.OS)
+				out[i+1] += fmt.Sprintf("|%s", node.Attributes["os.name"])
 			}
 			if c.verbose {
 				out[i+1] += fmt.Sprintf("|%s|%s",

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -2192,10 +2192,14 @@ func (n *Node) Stub(fields *NodeStubFields) *NodeListStub {
 
 	addr, _, _ := net.SplitHostPort(n.HTTPAddr)
 
-	s := &NodeListStub{
+	// Fetch key attributes from the main Attributes map.
+	s := &NodeListStub{}
+	s.Attributes = make(map[string]string)
+	s.Attributes["os.name"] = n.Attributes["os.name"]
+
+	s = &NodeListStub{
 		Address:               addr,
 		ID:                    n.ID,
-		OS:                    n.Attributes["os.name"],
 		Datacenter:            n.Datacenter,
 		Name:                  n.Name,
 		NodeClass:             n.NodeClass,
@@ -2226,7 +2230,7 @@ func (n *Node) Stub(fields *NodeStubFields) *NodeListStub {
 type NodeListStub struct {
 	Address               string
 	ID                    string
-	OS                    string
+	Attributes            map[string]string
 	Datacenter            string
 	Name                  string
 	NodeClass             string