fingerprint: Restore support for legacy memory fingerprint

hashicorp · Sep 4, 2019 · e9a8e9e · e9a8e9e
1 parent 370d147
commit e9a8e9e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/client/fingerprint/memory.go b/client/fingerprint/memory.go
@@ -43,9 +43,15 @@ func (f *MemoryFingerprint) Fingerprint(req *FingerprintRequest, resp *Fingerpri
 	if totalMemory > 0 {
 		resp.AddAttribute("memory.totalbytes", fmt.Sprintf("%d", totalMemory))
 
+		memoryMB := totalMemory / bytesInMB
+
+		resp.Resources = &structs.Resources{
+			MemoryMB: int(memoryMB),
+		}
+
 		resp.NodeResources = &structs.NodeResources{
 			Memory: structs.NodeMemoryResources{
-				MemoryMB: totalMemory / bytesInMB,
+				MemoryMB: memoryMB,
 			},
 		}
 	}

diff --git a/client/fingerprint/memory_test.go b/client/fingerprint/memory_test.go
@@ -24,6 +24,8 @@ func TestMemoryFingerprint(t *testing.T) {
 	require.NoError(err)
 
 	assertNodeAttributeContains(t, response.Attributes, "memory.totalbytes")
+	require.NotNil(response.Resources, "expected response Resources to not be nil")
+	require.NotZero(response.Resources.MemoryMB, "expected memory to be non-zero")
 	require.NotNil(response.NodeResources, "expected response NodeResources to not be nil")
 	require.NotZero(response.NodeResources.Memory.MemoryMB, "expected memory to be non-zero")
 }
@@ -44,6 +46,8 @@ func TestMemoryFingerprint_Override(t *testing.T) {
 
 	assertNodeAttributeContains(t, response.Attributes, "memory.totalbytes")
 	require := require.New(t)
+	require.NotNil(response.Resources)
+	require.EqualValues(response.Resources.MemoryMB, memoryMB)
 	require.NotNil(response.NodeResources)
 	require.EqualValues(response.NodeResources.Memory.MemoryMB, memoryMB)
 }