Adds EC2 metadata httpEndpoint field (#2016)

* Adds EC2 metadata httpEndpoint field Updates dictionary Fixes plugins, and sets cnquey min version for httpEndpoint Signed-off-by: Scott Ford <[email protected]> * update proto version --------- Signed-off-by: Scott Ford <[email protected]> Co-authored-by: Dominik Richter <[email protected]>
mondoohq · Oct 2, 2023 · 610bdc8 · 610bdc8
1 parent 59f7065
commit 610bdc8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -21,8 +21,8 @@ gpu
 gvnic
 hostkeys
 iap
-iex
 ilb
+IMDS
 ingresstls
 iotedge
 linux

diff --git a/providers/aws/resources/aws.lr b/providers/aws/resources/aws.lr
@@ -1640,6 +1640,8 @@ private aws.ec2.instance @defaults("arn state") {
   vpc() aws.vpc
   // A value of optional for http tokens denotes imdsv1 server compatibility; required is imdsv2
   httpTokens string
+  // Status of the IMDS endpoint is enabled on the instance
+  httpEndpoint string
   // Patch state information about the instance
   patchState() dict
   // State of the instance (pending, running, stopping, stopped, rebooting, or terminated)

diff --git a/providers/aws/resources/aws.lr.go b/providers/aws/resources/aws.lr.go
diff --git a/providers/aws/resources/aws.lr.manifest.yaml b/providers/aws/resources/aws.lr.manifest.yaml
@@ -838,6 +838,8 @@ resources:
       detailedMonitoring: {}
       deviceMappings: {}
       ebsOptimized: {}
+      httpEndpoint:
+        min_mondoo_version: 9.0.0
       httpTokens: {}
       image: {}
       instanceId: {}

diff --git a/providers/aws/resources/aws_ec2.go b/providers/aws/resources/aws_ec2.go
@@ -714,6 +714,7 @@ func (a *mqlAwsEc2) gatherInstanceInfo(instances []ec2types.Reservation, imdsvVe
 				"publicIp":              llx.StringData(convert.ToString(instance.PublicIpAddress)),
 				"detailedMonitoring":    llx.StringData(string(instance.Monitoring.State)),
 				"httpTokens":            llx.StringData(httpTokens),
+				"httpEndpoint":          llx.StringData(string(instance.MetadataOptions.HttpEndpoint)),
 				"state":                 llx.StringData(string(instance.State.Name)),
 				"deviceMappings":        llx.ArrayData(mqlDevices, types.Resource("aws.ec2.instance.device")),
 				"securityGroups":        llx.ArrayData(sgs, types.Resource("aws.ec2.securitygroup")),
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,8 @@ gpu @@
     gvnic
     hostkeys
     iap
-    iex
     ilb
+    IMDS
     ingresstls
     iotedge
     linux
@@ Expand Down @@