Add region to aws.vpc.subnet (#3858)

Also cleanup some descriptions and add region into the defaults for aws.vpc.subnet Signed-off-by: Tim Smith <[email protected]>
mondoohq · Apr 26, 2024 · e4f1e24 · e4f1e24
1 parent 15dcb2c
commit e4f1e24
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/providers/aws/resources/aws.lr b/providers/aws/resources/aws.lr
@@ -76,7 +76,7 @@ private aws.vpc.routetable @defaults("id routes.length") {
 }
 
 // Amazon Virtual Private Cloud (VPC) subnet
-private aws.vpc.subnet @defaults("id cidrs availabilityZone defaultForAvailabilityZone") {
+private aws.vpc.subnet @defaults("id cidrs region availabilityZone defaultForAvailabilityZone") {
   // ARN of the subnet
   arn string
   // Unique ID of the subnet
@@ -93,6 +93,8 @@ private aws.vpc.subnet @defaults("id cidrs availabilityZone defaultForAvailabili
   assignIpv6AddressOnCreation bool
   // The state of the subnet: pending or available
   state string
+  // Region in which the VPC subnet exists
+  region string
 }
 
 // Amazon Virtual Private Cloud (VPC) endpoint
@@ -103,7 +105,7 @@ private aws.vpc.endpoint @defaults("id type region") {
   type string
   // VPC in which the endpoint exists
   vpc string
-  // Region in which the VPC exists
+  // Region in which the VPC endpoint exists
   region string
   // The name of the endpoint service
   serviceName string
@@ -125,7 +127,7 @@ private aws.vpc.flowlog @defaults("id region status") {
   id string
   // VPC in which the flow log exists
   vpc string
-  // Region in which the flow log exists
+  // Region in which the VPC flow log exists
   region string
   // Status of the flow log
   status string

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
@@ -2658,6 +2658,7 @@ resources:
       defaultForAvailabilityZone: {}
       id: {}
       mapPublicIpOnLaunch: {}
+      region: {}
       state: {}
     is_private: true
     min_mondoo_version: 9.0.0

diff --git a/providers/aws/resources/aws_vpc.go b/providers/aws/resources/aws_vpc.go
@@ -279,6 +279,7 @@ func (a *mqlAwsVpc) subnets() ([]interface{}, error) {
 					"defaultForAvailabilityZone":  llx.BoolDataPtr(subnet.DefaultForAz),
 					"id":                          llx.StringDataPtr(subnet.SubnetId),
 					"mapPublicIpOnLaunch":         llx.BoolDataPtr(subnet.MapPublicIpOnLaunch),
+					"region":                      llx.StringData(a.Region.Data),
 					"state":                       llx.StringData(string(subnet.State)),
 				})
 			if err != nil {