🐛 fix v8 compat issues (#2089)

Fixes #2088 Signed-off-by: Dominik Richter <[email protected]>
mondoohq · Oct 5, 2023 · 8cc9bca · 8cc9bca
1 parent f601fb7
commit 8cc9bca
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 13 deletions.
diff --git a/providers/aws/resources/aws.lr b/providers/aws/resources/aws.lr
@@ -1393,6 +1393,8 @@ private aws.ecr.repository {
   images() []aws.ecr.image
   // Region where the image is stored
   region string
+  // Repository option to scan on image push
+  imageScanOnPush bool
 }
 
 // AWS Elastic Container Registry Image

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
@@ -1100,6 +1100,8 @@ resources:
         The `aws.ecr.repository` resource can be used to assess the Amazon Elastic Container Registry repositories.
     fields:
       arn: {}
+      imageScanOnPush:
+        min_mondoo_version: 8.19.0
       images: {}
       name: {}
       public: {}

diff --git a/providers/aws/resources/aws_ecr.go b/providers/aws/resources/aws_ecr.go
@@ -111,15 +111,20 @@ func (a *mqlAwsEcr) getPrivateRepositories(conn *connection.AwsConnection) []*jo
 				return nil, err
 			}
 			for i := range repoResp.Repositories {
+				imageScanOnPush := false
 				r := repoResp.Repositories[i]
+				if r.ImageScanningConfiguration != nil {
+					imageScanOnPush = r.ImageScanningConfiguration.ScanOnPush
+				}
 				mqlRepoResource, err := CreateResource(a.MqlRuntime, "aws.ecr.repository",
 					map[string]*llx.RawData{
-						"arn":        llx.StringData(convert.ToString(r.RepositoryArn)),
-						"name":       llx.StringData(convert.ToString(r.RepositoryName)),
-						"uri":        llx.StringData(convert.ToString(r.RepositoryUri)),
-						"registryId": llx.StringData(convert.ToString(r.RegistryId)),
-						"public":     llx.BoolData(false),
-						"region":     llx.StringData(region),
+						"arn":             llx.StringData(convert.ToString(r.RepositoryArn)),
+						"name":            llx.StringData(convert.ToString(r.RepositoryName)),
+						"uri":             llx.StringData(convert.ToString(r.RepositoryUri)),
+						"registryId":      llx.StringData(convert.ToString(r.RegistryId)),
+						"public":          llx.BoolData(false),
+						"region":          llx.StringData(region),
+						"imageScanOnPush": llx.BoolData(imageScanOnPush),
 					})
 				if err != nil {
 					return nil, err
@@ -276,14 +281,16 @@ func (a *mqlAwsEcr) publicRepositories() ([]interface{}, error) {
 	}
 	for i := range repoResp.Repositories {
 		r := repoResp.Repositories[i]
+
 		mqlRepoResource, err := CreateResource(a.MqlRuntime, "aws.ecr.repository",
 			map[string]*llx.RawData{
-				"arn":        llx.StringData(convert.ToString(r.RepositoryArn)),
-				"name":       llx.StringData(convert.ToString(r.RepositoryName)),
-				"uri":        llx.StringData(convert.ToString(r.RepositoryUri)),
-				"registryId": llx.StringData(convert.ToString(r.RegistryId)),
-				"public":     llx.BoolData(true),
-				"region":     llx.StringData("us-east-1"),
+				"arn":             llx.StringData(convert.ToString(r.RepositoryArn)),
+				"name":            llx.StringData(convert.ToString(r.RepositoryName)),
+				"uri":             llx.StringData(convert.ToString(r.RepositoryUri)),
+				"registryId":      llx.StringData(convert.ToString(r.RegistryId)),
+				"public":          llx.BoolData(true),
+				"region":          llx.StringData("us-east-1"),
+				"imageScanOnPush": llx.BoolData(false),
 			})
 		if err != nil {
 			return nil, err

diff --git a/providers/ms365/resources/ms365.lr.manifest.yaml b/providers/ms365/resources/ms365.lr.manifest.yaml
@@ -11,7 +11,7 @@ resources:
       serviceprincipals: {}
       settings: {}
       users: {}
-    min_mondoo_version: latest
+    min_mondoo_version: 5.15.0
   microsoft.application:
     fields:
       appId: {}

diff --git a/providers/terraform/resources/terraform.lr b/providers/terraform/resources/terraform.lr
@@ -24,9 +24,12 @@ terraform {
   outputs() []terraform.block
 }
 
+// Terraform resources are all blocks with a type set to resource
 terraform.resources {
   []terraform.block
+  // List all Terraform resources or search by name
   init(filter any)
+  // Filter applied to this list of Terraform resources. May be a string or regex.
   filter any
 }
 

diff --git a/providers/vcd/resources/externalnetworks.go b/providers/vcd/resources/externalnetworks.go
@@ -47,6 +47,17 @@ func (v *mqlVcdExternalNetwork) id() (string, error) {
 	if v.Name.Error != nil {
 		return "", v.Name.Error
 	}
+
+	// FIXME: DEPRECATED, remove in v10.0. The ID field will be removed and
+	// this request won't be necessary anymore. vv
+	urn := v.GetUrn()
+	if urn == nil {
+		v.Id = plugin.TValue[string]{State: plugin.StateIsSet | plugin.StateIsNull}
+	} else {
+		v.Id = *urn
+	}
+	// ^^
+
 	return "vcd.externalNetwork/" + v.Name.Data, nil
 }
 

diff --git a/providers/vcd/resources/vcd.lr b/providers/vcd/resources/vcd.lr
@@ -120,6 +120,8 @@ vcd.networkPool {
 
 // VMware Cloud Director External Network
 private vcd.externalNetwork @defaults("name") {
+  // URN of the network. Deprecated: Please use the urn field instead.
+  id string
   // Unique name for the network
   name string
 	// URN of the network

diff --git a/providers/vcd/resources/vcd.lr.go b/providers/vcd/resources/vcd.lr.go