🧹 improve the aws iam virtual mfa device resource

mondoohq · Aug 20, 2024 · 8f9ed74 · 8f9ed74
1 parent 948f78c
commit 8f9ed74
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/providers/aws/resources/aws.lr b/providers/aws/resources/aws.lr
@@ -891,7 +891,7 @@ private aws.iam.virtualmfadevice @defaults("serialNumber") {
  // Time when the MFA device was enabled
  enableDate time
  // User associated with the MFA device
- user aws.iam.user
+ user() aws.iam.user
 }
 
 // AWS IAM Access Analyzer resource (for assessing the configuration of AWS IAM Access Analyzer)

diff --git a/providers/aws/resources/aws.lr.go b/providers/aws/resources/aws.lr.go
diff --git a/providers/aws/resources/aws_iam.go b/providers/aws/resources/aws_iam.go
@@ -330,11 +330,35 @@ func (a *mqlAwsIam) virtualMfaDevices() ([]interface{}, error) {
  }
 
  res = append(res, mqlAwsIamMfaDevice)
+ if device.User != nil {
+ mqlAwsIamMfaDevice.(*mqlAwsIamVirtualmfadevice).cacheUserArn = device.User.Arn
+ mqlAwsIamMfaDevice.(*mqlAwsIamVirtualmfadevice).cacheUserName = device.User.UserName
+ }
  }
 
  return res, nil
 }
 
+func (a *mqlAwsIamVirtualmfadevice) user() (*mqlAwsIamUser, error) {
+ if a.cacheUserArn != nil && a.cacheUserName != nil {
+ awsIamUser, err := NewResource(a.MqlRuntime, "aws.iam.user", map[string]*llx.RawData{
+ "arn": llx.StringDataPtr(a.cacheUserArn),
+ "name": llx.StringDataPtr(a.cacheUserName),
+ })
+ if err != nil {
+ return nil, err
+ }
+ return awsIamUser.(*mqlAwsIamUser), nil
+ }
+ a.User.State = plugin.StateIsNull
+ return nil, nil
+}
+
+type mqlAwsIamVirtualmfadeviceInternal struct {
+ cacheUserName *string
+ cacheUserArn *string
+}
+
 func (a *mqlAwsIam) mqlPolicies(policies []iamtypes.Policy) ([]interface{}, error) {
  res := []interface{}{}
  for i := range policies {