improving the resources

Signed-off-by: Hossein Rouhani <[email protected]>
mondoohq · Nov 13, 2024 · 7ab3ab8 · 7ab3ab8
1 parent ce5348f
commit 7ab3ab8
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 31 deletions.
diff --git a/providers/ms365/resources/conditional-access.go b/providers/ms365/resources/conditional-access.go
@@ -11,7 +11,7 @@ import (
 	"go.mondoo.com/cnquery/v11/providers/ms365/connection"
 )
 
-func (a *mqlMicrosoftConditionalAccess) namedLocations() ([]interface{}, error) {
+func (a *mqlMicrosoftConditionalAccessNamedLocations) ipLocations() ([]interface{}, error) {
 	conn := a.MqlRuntime.Connection.(*connection.Ms365Connection)
 	graphClient, err := conn.GraphClient()
 	if err != nil {
@@ -20,9 +20,6 @@ func (a *mqlMicrosoftConditionalAccess) namedLocations() ([]interface{}, error)
 
 	ctx := context.Background()
 	namedLocations, err := graphClient.Identity().ConditionalAccess().NamedLocations().Get(ctx, nil)
-	if err != nil {
-		return nil, transformError(err)
-	}
 
 	var locationDetails []interface{}
 	for _, location := range namedLocations.GetValue() {
@@ -60,7 +57,7 @@ func (m *mqlMicrosoftConditionalAccessCountryNamedLocation) id() (string, error)
 	return m.Name.Data, nil
 }
 
-func (a *mqlMicrosoftConditionalAccess) countryLocations() ([]interface{}, error) {
+func (a *mqlMicrosoftConditionalAccessNamedLocations) countryLocations() ([]interface{}, error) {
 	conn := a.MqlRuntime.Connection.(*connection.Ms365Connection)
 	graphClient, err := conn.GraphClient()
 	if err != nil {
@@ -69,9 +66,6 @@ func (a *mqlMicrosoftConditionalAccess) countryLocations() ([]interface{}, error
 
 	ctx := context.Background()
 	namedLocations, err := graphClient.Identity().ConditionalAccess().NamedLocations().Get(ctx, nil)
-	if err != nil {
-		return nil, transformError(err)
-	}
 
 	var locationDetails []interface{}
 	for _, location := range namedLocations.GetValue() {

diff --git a/providers/ms365/resources/ms365.lr b/providers/ms365/resources/ms365.lr
@@ -58,9 +58,15 @@ microsoft.tenant @defaults("name") {
 
 // Microsoft Conditional Access Policies
 microsoft.conditionalAccess {
-  // IP named location
-  namedLocations() []microsoft.conditionalAccess.ipNamedLocation
-  // Country-based named location
+  // Named locations container
+  namedLocations microsoft.conditionalAccess.namedLocations
+}
+
+// Container for Microsoft Conditional Access Named Locations
+microsoft.conditionalAccess.namedLocations {
+  // IP-based named locations
+  ipLocations() []microsoft.conditionalAccess.ipNamedLocation
+  // Country-based named locations
   countryLocations() []microsoft.conditionalAccess.countryNamedLocation
 }
 

diff --git a/providers/ms365/resources/ms365.lr.go b/providers/ms365/resources/ms365.lr.go
diff --git a/providers/ms365/resources/ms365.lr.manifest.yaml b/providers/ms365/resources/ms365.lr.manifest.yaml
@@ -122,10 +122,7 @@ resources:
     min_mondoo_version: 9.0.0
   microsoft.conditionalAccess:
     fields:
-      countryLocations: {}
-      name: {}
       namedLocations: {}
-      trusted: {}
     min_mondoo_version: 9.0.0
   microsoft.conditionalAccess.countryNamedLocation:
     fields:
@@ -137,10 +134,10 @@ resources:
       name: {}
       trusted: {}
     min_mondoo_version: 9.0.0
-  microsoft.conditionalAccess.namedLocation:
+  microsoft.conditionalAccess.namedLocations:
     fields:
-      name: {}
-      trusted: {}
+      countryLocations: {}
+      ipLocations: {}
     min_mondoo_version: 9.0.0
   microsoft.devicemanagement:
     fields: