From 5e2e2c3c6247186e46750720f2cf91521d494e29 Mon Sep 17 00:00:00 2001
From: Matt Cadorette <matthew.cadorette@lacework.net>
Date: Mon, 29 Apr 2024 17:15:09 -0400
Subject: [PATCH] feat: expose raw machine tags for external automation (#1618)

Fixes #1615

Enable accessing the raw machine tags for external automation
---
 api/v2_vulnerabilities.go      | 15 +++++++++++++++
 api/v2_vulnerabilities_test.go | 13 +++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/api/v2_vulnerabilities.go b/api/v2_vulnerabilities.go
index f6fb795a0..0c9085b8c 100644
--- a/api/v2_vulnerabilities.go
+++ b/api/v2_vulnerabilities.go
@@ -517,6 +517,21 @@ func (v *VulnerabilityHost) GetMachineTags() (machineTags VulnerabilityHostMachi
 	return
 }
 
+func (v *VulnerabilityHost) GetMachineTagsRaw() (map[string]interface{}, error) {
+	jsonTags, err := json.Marshal(v.MachineTags)
+	if err != nil {
+		return nil, err
+	}
+
+	var rawTags map[string]interface{}
+
+	if err := json.Unmarshal(jsonTags, &rawTags); err != nil {
+		return nil, err
+	}
+
+	return rawTags, nil
+}
+
 type VulnerabilityHostMachineTags struct {
 	Account                               string `json:"Account"`
 	AmiID                                 string `json:"AmiId"`
diff --git a/api/v2_vulnerabilities_test.go b/api/v2_vulnerabilities_test.go
index ddef57314..6700c5085 100644
--- a/api/v2_vulnerabilities_test.go
+++ b/api/v2_vulnerabilities_test.go
@@ -437,6 +437,19 @@ func TestV2Vulnerabilities_Hosts_AllPages(t *testing.T) {
 	}
 }
 
+func TestV2Vulnerabilities_HostGetAwsMachineTagsRaw(t *testing.T) {
+	var mockHostResponse api.VulnerabilitiesHostResponse
+	err := json.Unmarshal([]byte(mockVulnerabilitiesHostsResponseSetTags(vulnerabilityHostAwsMachineTags)), &mockHostResponse)
+	assert.NoError(t, err)
+
+	tags, err := mockHostResponse.Data[0].GetMachineTagsRaw()
+	assert.NoError(t, err)
+	assert.Equal(t, tags["Account"], "123456789038")
+	assert.Equal(t, tags["AmiId"], "ami-1234567890540c038")
+	assert.Equal(t, tags["ExternalIp"], "1.5.8.9")
+	assert.Equal(t, tags["Hostname"], "ip-192-168-28-69.us-east-2.compute.internal")
+}
+
 func TestV2Vulnerabilities_HostGetAwsMachineTags(t *testing.T) {
 	var mockHostResponse api.VulnerabilitiesHostResponse
 	err := json.Unmarshal([]byte(mockVulnerabilitiesHostsResponseSetTags(vulnerabilityHostAwsMachineTags)), &mockHostResponse)