Use location instead of region in the resources

This is consistent with our other GCP resources

Signed-off-by: Tim Smith <tsmith84@gmail.com>

Author: tas50

providers/gcp/resources/cloud_functions.go

@@ -145,7 +145,7 @@ func (g *mqlGcpProject) cloudFunctions() ([]any, error) {
 
 		mqlCloudFuncs, err := CreateResource(g.MqlRuntime, "gcp.project.cloudFunction", map[string]*llx.RawData{
 			"projectId":           llx.StringData(projectId),
-			"region":              llx.StringData(parseLocationFromPath(f.Name)),
+			"location":            llx.StringData(parseLocationFromPath(f.Name)),
 			"name":                llx.StringData(parseResourceName(f.Name)),
 			"description":         llx.StringData(f.Description),
 			"sourceArchiveUrl":    llx.StringData(sourceArchiveUrl),
@@ -210,7 +210,7 @@ func initGcpProjectCloudFunction(runtime *plugin.Runtime, args map[string]*llx.R
 		}
 		if ids := getAssetIdentifier(runtime); ids != nil {
 			args["name"] = llx.StringData(ids.name)
-			args["region"] = llx.StringData(ids.region)
+			args["location"] = llx.StringData(ids.region)
 			args["projectId"] = llx.StringData(ids.project)
 		} else {
 			return nil, nil, errors.New("no asset identifier found")
@@ -230,13 +230,13 @@ func initGcpProjectCloudFunction(runtime *plugin.Runtime, args map[string]*llx.R
 	}
 
 	nameVal := args["name"].Value.(string)
-	regionVal := ""
-	if args["region"] != nil {
-		regionVal = args["region"].Value.(string)
+	locationVal := ""
+	if args["location"] != nil {
+		locationVal = args["location"].Value.(string)
 	}
 	for _, f := range funcs.Data {
 		fn := f.(*mqlGcpProjectCloudFunction)
-		if fn.Name.Data == nameVal && (regionVal == "" || fn.Region.Data == regionVal) {
+		if fn.Name.Data == nameVal && (locationVal == "" || fn.Location.Data == locationVal) {
 			return args, fn, nil
 		}
 	}

providers/gcp/resources/dataproc.go

@@ -584,7 +584,7 @@ func (g *mqlGcpProjectDataprocService) clusters() ([]any, error) {
 
 					mqlCluster, err := CreateResource(g.MqlRuntime, "gcp.project.dataprocService.cluster", map[string]*llx.RawData{
 						"projectId":            llx.StringData(projectId),
-						"region":               llx.StringData(regionName),
+						"location":             llx.StringData(regionName),
 						"name":                 llx.StringData(c.ClusterName),
 						"uuid":                 llx.StringData(c.ClusterUuid),
 						"config":               llx.ResourceData(mqlConfig, "gcp.project.dataprocService.cluster.config"),
@@ -652,7 +652,7 @@ func initGcpProjectDataprocServiceCluster(runtime *plugin.Runtime, args map[stri
 		}
 		if ids := getAssetIdentifier(runtime); ids != nil {
 			args["name"] = llx.StringData(ids.name)
-			args["region"] = llx.StringData(ids.region)
+			args["location"] = llx.StringData(ids.region)
 			args["projectId"] = llx.StringData(ids.project)
 		} else {
 			return nil, nil, errors.New("no asset identifier found")
@@ -673,13 +673,13 @@ func initGcpProjectDataprocServiceCluster(runtime *plugin.Runtime, args map[stri
 	}
 
 	nameVal := args["name"].Value.(string)
-	regionVal := ""
-	if args["region"] != nil {
-		regionVal = args["region"].Value.(string)
+	locationVal := ""
+	if args["location"] != nil {
+		locationVal = args["location"].Value.(string)
 	}
 	for _, c := range clusters.Data {
 		cluster := c.(*mqlGcpProjectDataprocServiceCluster)
-		if cluster.Name.Data == nameVal && (regionVal == "" || cluster.Region.Data == regionVal) {
+		if cluster.Name.Data == nameVal && (locationVal == "" || cluster.Location.Data == locationVal) {
 			return args, cluster, nil
 		}
 	}

providers/gcp/resources/discovery.go

@@ -1032,10 +1032,10 @@ func discoverProject(conn *connection.GcpConnection, gcpProject *mqlGcpProject,
 		}
 		for i := range funcs.Data {
 			fn := funcs.Data[i].(*mqlGcpProjectCloudFunction)
-			region := fn.Region.Data
+			location := fn.Location.Data
 			assetList = append(assetList, &inventory.Asset{
 				PlatformIds: []string{
-					connection.NewResourcePlatformID("cloud-functions", gcpProject.Id.Data, region, "function", fn.Name.Data),
+					connection.NewResourcePlatformID("cloud-functions", gcpProject.Id.Data, location, "function", fn.Name.Data),
 				},
 				Name: fn.Name.Data,
 				Platform: &inventory.Platform{
@@ -1044,7 +1044,7 @@ func discoverProject(conn *connection.GcpConnection, gcpProject *mqlGcpProject,
 					Runtime:               "gcp",
 					Kind:                  "gcp-object",
 					Family:                []string{"google"},
-					TechnologyUrlSegments: connection.ResourceTechnologyUrl("cloud-functions", gcpProject.Id.Data, region, "function", fn.Name.Data),
+					TechnologyUrlSegments: connection.ResourceTechnologyUrl("cloud-functions", gcpProject.Id.Data, location, "function", fn.Name.Data),
 				},
 				Labels:      mapStrInterfaceToMapStrStr(fn.GetLabels().Data),
 				Connections: []*inventory.Config{conn.Conf.Clone(inventory.WithoutDiscovery(), inventory.WithParentConnectionId(conn.Conf.Id))},
@@ -1063,10 +1063,10 @@ func discoverProject(conn *connection.GcpConnection, gcpProject *mqlGcpProject,
 		}
 		for i := range clusters.Data {
 			cluster := clusters.Data[i].(*mqlGcpProjectDataprocServiceCluster)
-			region := cluster.Region.Data
+			location := cluster.Location.Data
 			assetList = append(assetList, &inventory.Asset{
 				PlatformIds: []string{
-					connection.NewResourcePlatformID("dataproc", gcpProject.Id.Data, region, "cluster", cluster.Name.Data),
+					connection.NewResourcePlatformID("dataproc", gcpProject.Id.Data, location, "cluster", cluster.Name.Data),
 				},
 				Name: cluster.Name.Data,
 				Platform: &inventory.Platform{
@@ -1075,7 +1075,7 @@ func discoverProject(conn *connection.GcpConnection, gcpProject *mqlGcpProject,
 					Runtime:               "gcp",
 					Kind:                  "gcp-object",
 					Family:                []string{"google"},
-					TechnologyUrlSegments: connection.ResourceTechnologyUrl("dataproc", gcpProject.Id.Data, region, "cluster", cluster.Name.Data),
+					TechnologyUrlSegments: connection.ResourceTechnologyUrl("dataproc", gcpProject.Id.Data, location, "cluster", cluster.Name.Data),
 				},
 				Labels:      mapStrInterfaceToMapStrStr(cluster.GetLabels().Data),
 				Connections: []*inventory.Config{conn.Conf.Clone(inventory.WithoutDiscovery(), inventory.WithParentConnectionId(conn.Conf.Id))},

providers/gcp/resources/gcp.lr

@@ -2608,8 +2608,8 @@ private gcp.project.iamService.serviceAccount.key @defaults("name") {
 private gcp.project.cloudFunction @defaults("name") {
   // Project ID
   projectId string
-  // Region where the function is deployed
-  region string
+  // Location where the function is deployed
+  location string
   // Cloud function name
   name string
   // Cloud function description
@@ -2691,8 +2691,8 @@ private gcp.project.dataprocService {
 private gcp.project.dataprocService.cluster @defaults("name") {
   // Project ID
   projectId string
-  // Region where the cluster is deployed
-  region string
+  // Location where the cluster is deployed
+  location string
   // Cluster name
   name string
   // Cluster UUID

providers/gcp/resources/gcp.lr.go

@@ -342,13 +342,13 @@ resources:
       ingressSettings: {}
       kmsKeyName: {}
       labels: {}
+      location:
+        min_mondoo_version: 11.0.146
       maxInstances: {}
       minInstances: {}
       name: {}
       network: {}
       projectId: {}
-      region:
-        min_mondoo_version: 11.0.146
       runtime: {}
       secretEnvVars: {}
       secretVolumes: {}
@@ -1108,11 +1108,11 @@ resources:
     fields:
       config: {}
       labels: {}
+      location:
+        min_mondoo_version: 11.0.146
       metrics: {}
       name: {}
       projectId: {}
-      region:
-        min_mondoo_version: 11.0.146
       status: {}
       statusHistory: {}
       uuid: {}