⭐ Add missing technology segment urls (#4557)

* add a common path for saas * update github url segments * add gitlab url segments * add atlassian url segments * add common url path for iac * add ansible url segments * add cloudformation url segments * add okta url segments * add terraform url segments * add slack url segments * add oci url segments * add network as common technology * allow no key * add network host url segments * add network ipmi url segments * add shodan url segments * add arista url segments * add dockerfile url segments * update k8s-manifest url segments * add ms365 url segments * fix ansible url
mondoohq · Aug 16, 2024 · ebde260 · ebde260
1 parent 99537a4
commit ebde260
Show file tree

Hide file tree

Showing 37 changed files with 358 additions and 152 deletions.
diff --git a/providers-sdk/v1/inventory/asset_url.go b/providers-sdk/v1/inventory/asset_url.go
@@ -204,18 +204,24 @@ func (a *AssetUrlBranch) validate() error {
 			continue
 		}
 
-		if err := validateKey(branch.Key); err != nil {
-			return err
-		}
-
-		for value, next := range branch.Values {
-			if err := validateValue(value); err != nil {
+		if branch.Key != "" {
+			if err := validateKey(branch.Key); err != nil {
 				return err
 			}
-			if next != nil {
-				branches = append(branches, next)
+			for value, next := range branch.Values {
+				if err := validateValue(value); err != nil {
+					return err
+				}
+				if next != nil {
+					branches = append(branches, next)
+				}
+			}
+		} else {
+			if len(branch.Values) != 0 {
+				return errors.New("asset url segment without key must not have values set")
 			}
 		}
+
 	}
 
 	return nil

diff --git a/providers/ansible/config/config.go b/providers/ansible/config/config.go
@@ -4,6 +4,7 @@
 package config
 
 import (
+	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
 	"go.mondoo.com/cnquery/v11/providers/ansible/provider"
 )
@@ -24,4 +25,14 @@ var Config = plugin.Provider{
 			Flags:     []plugin.Flag{},
 		},
 	},
+	AssetUrlTrees: []*inventory.AssetUrlBranch{
+		{
+			PathSegments: []string{"technology=iac", "category=ansible"},
+			Key:          "kind",
+			Title:        "Kind",
+			Values: map[string]*inventory.AssetUrlBranch{
+				"playbook": nil,
+			},
+		},
+	},
 }
diff --git a/providers/ansible/provider/provider.go b/providers/ansible/provider/provider.go
@@ -131,10 +131,11 @@ func (s *Service) detect(asset *inventory.Asset, conn *connection.AnsibleConnect
 	asset.Name = conn.Conf.Host
 
 	asset.Platform = &inventory.Platform{
-		Name:   "ansible-playbook",
-		Family: []string{"ansible"},
-		Kind:   "api",
-		Title:  "Ansible Playbook",
+		Name:                  "ansible-playbook",
+		Family:                []string{"ansible"},
+		Kind:                  "api",
+		Title:                 "Ansible Playbook",
+		TechnologyUrlSegments: []string{"iac", "ansible", "playbook"},
 	}
 
 	projectPath, ok := asset.Connections[0].Options["path"]

diff --git a/providers/arista/config/config.go b/providers/arista/config/config.go
@@ -4,6 +4,7 @@
 package config
 
 import (
+	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
 	"go.mondoo.com/cnquery/v11/providers/arista/provider"
 )
@@ -41,4 +42,9 @@ var Config = plugin.Provider{
 			},
 		},
 	},
+	AssetUrlTrees: []*inventory.AssetUrlBranch{
+		{
+			PathSegments: []string{"technology=network", "category=arista"},
+		},
+	},
 }
diff --git a/providers/arista/provider/provider.go b/providers/arista/provider/provider.go
@@ -168,13 +168,14 @@ func (s *Service) detect(asset *inventory.Asset, conn *connection.AristaConnecti
 	}
 
 	asset.Platform = &inventory.Platform{
-		Name:    "arista-eos",
-		Version: version,
-		Arch:    arch,
-		Family:  []string{"arista"},
-		Kind:    "api",
-		Title:   "Arista EOS",
-		Runtime: "arista",
+		Name:                  "arista-eos",
+		Version:               version,
+		Arch:                  arch,
+		Family:                []string{"arista"},
+		Kind:                  "api",
+		Title:                 "Arista EOS",
+		Runtime:               "arista",
+		TechnologyUrlSegments: []string{"network", "arista"},
 	}
 
 	eosClient := eos.NewEos(conn.Client())

diff --git a/providers/atlassian/config/config.go b/providers/atlassian/config/config.go
@@ -4,6 +4,7 @@
 package config
 
 import (
+	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
 	"go.mondoo.com/cnquery/v11/providers/atlassian/connection/confluence"
 	"go.mondoo.com/cnquery/v11/providers/atlassian/provider"
@@ -80,4 +81,17 @@ For the SCIM token and the directory-id values: Atlassian provides these values
 			},
 		},
 	},
+	AssetUrlTrees: []*inventory.AssetUrlBranch{
+		{
+			PathSegments: []string{"technology=saas", "provider=atlassian"},
+			Key:          "kind",
+			Title:        "Kind",
+			Values: map[string]*inventory.AssetUrlBranch{
+				"admin":      nil,
+				"confluence": nil,
+				"jira":       nil,
+				"scim":       nil,
+			},
+		},
+	},
 }
diff --git a/providers/atlassian/connection/admin/platform.go b/providers/atlassian/connection/admin/platform.go
@@ -14,17 +14,19 @@ func (a *AdminConnection) PlatformInfo() *inventory.Platform {
 func GetPlatformForObject(platformName string) *inventory.Platform {
 	if platformName != "atlassian-admin" && platformName != "" {
 		return &inventory.Platform{
-			Name:    platformName,
-			Title:   "Atlassian Admin",
-			Kind:    "api",
-			Runtime: "atlassian",
+			Name:                  platformName,
+			Title:                 "Atlassian Admin",
+			Kind:                  "api",
+			Runtime:               "atlassian",
+			TechnologyUrlSegments: []string{"saas", "atlassian", "admin"},
 		}
 	}
 	return &inventory.Platform{
-		Name:    "atlassian-admin",
-		Title:   "Atlassian Admin",
-		Kind:    "api",
-		Runtime: "atlassian",
+		Name:                  "atlassian-admin",
+		Title:                 "Atlassian Admin",
+		Kind:                  "api",
+		Runtime:               "atlassian",
+		TechnologyUrlSegments: []string{"saas", "atlassian", "admin"},
 	}
 }
 

diff --git a/providers/atlassian/connection/confluence/platform.go b/providers/atlassian/connection/confluence/platform.go
@@ -16,17 +16,19 @@ func (a *ConfluenceConnection) PlatformInfo() *inventory.Platform {
 func GetPlatformForObject(platformName string) *inventory.Platform {
 	if platformName != "atlassian-confluence" && platformName != "" {
 		return &inventory.Platform{
-			Name:    platformName,
-			Title:   "Atlassian Confluence",
-			Kind:    "api",
-			Runtime: "atlassian",
+			Name:                  platformName,
+			Title:                 "Atlassian Confluence",
+			Kind:                  "api",
+			Runtime:               "atlassian",
+			TechnologyUrlSegments: []string{"saas", "atlassian", "confluence"},
 		}
 	}
 	return &inventory.Platform{
-		Name:    "atlassian-confluence",
-		Title:   "Atlassian Confluence",
-		Kind:    "api",
-		Runtime: "atlassian",
+		Name:                  "atlassian-confluence",
+		Title:                 "Atlassian Confluence",
+		Kind:                  "api",
+		Runtime:               "atlassian",
+		TechnologyUrlSegments: []string{"saas", "atlassian", "confluence"},
 	}
 }
 

diff --git a/providers/atlassian/connection/jira/platform.go b/providers/atlassian/connection/jira/platform.go
@@ -16,17 +16,19 @@ func (a *JiraConnection) PlatformInfo() *inventory.Platform {
 func GetPlatformForObject(platformName string) *inventory.Platform {
 	if platformName != "atlassian-jira" && platformName != "" {
 		return &inventory.Platform{
-			Name:    platformName,
-			Title:   "Atlassian Jira",
-			Kind:    "api",
-			Runtime: "atlassian",
+			Name:                  platformName,
+			Title:                 "Atlassian Jira",
+			Kind:                  "api",
+			Runtime:               "atlassian",
+			TechnologyUrlSegments: []string{"saas", "atlassian", "jira"},
 		}
 	}
 	return &inventory.Platform{
-		Name:    "atlassian-jira",
-		Title:   "Atlassian Jira",
-		Kind:    "api",
-		Runtime: "atlassian",
+		Name:                  "atlassian-jira",
+		Title:                 "Atlassian Jira",
+		Kind:                  "api",
+		Runtime:               "atlassian",
+		TechnologyUrlSegments: []string{"saas", "atlassian", "jira"},
 	}
 }
 

diff --git a/providers/atlassian/connection/scim/platform.go b/providers/atlassian/connection/scim/platform.go
@@ -14,17 +14,19 @@ func (a *ScimConnection) PlatformInfo() *inventory.Platform {
 func GetPlatformForObject(platformName string) *inventory.Platform {
 	if platformName != "atlassian-scim" && platformName != "" {
 		return &inventory.Platform{
-			Name:    platformName,
-			Title:   "Atlassian SCIM",
-			Kind:    "api",
-			Runtime: "atlassian",
+			Name:                  platformName,
+			Title:                 "Atlassian SCIM",
+			Kind:                  "api",
+			Runtime:               "atlassian",
+			TechnologyUrlSegments: []string{"saas", "atlassian", "scim"},
 		}
 	}
 	return &inventory.Platform{
-		Name:    "atlassian-scim",
-		Title:   "Atlassian SCIM",
-		Kind:    "api",
-		Runtime: "atlassian",
+		Name:                  "atlassian-scim",
+		Title:                 "Atlassian SCIM",
+		Kind:                  "api",
+		Runtime:               "atlassian",
+		TechnologyUrlSegments: []string{"saas", "atlassian", "scim"},
 	}
 }
 

diff --git a/providers/cloudformation/config/config.go b/providers/cloudformation/config/config.go
@@ -4,6 +4,7 @@
 package config
 
 import (
+	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
 	"go.mondoo.com/cnquery/v11/providers/cloudformation/provider"
 )
@@ -24,4 +25,14 @@ var Config = plugin.Provider{
 			Flags:     []plugin.Flag{},
 		},
 	},
+	AssetUrlTrees: []*inventory.AssetUrlBranch{
+		{
+			PathSegments: []string{"technology=iac", "category=cloudformation"},
+			Key:          "kind",
+			Title:        "Kind",
+			Values: map[string]*inventory.AssetUrlBranch{
+				"template": nil,
+			},
+		},
+	},
 }
diff --git a/providers/cloudformation/provider/provider.go b/providers/cloudformation/provider/provider.go
@@ -131,11 +131,12 @@ func (s *Service) detect(asset *inventory.Asset, conn *connection.Cloudformation
 	asset.Name = conn.Conf.Host
 
 	asset.Platform = &inventory.Platform{
-		Name:    "cloudformation",
-		Family:  []string{"cloudformation"},
-		Runtime: "cloudformation",
-		Kind:    "api",
-		Title:   "AWS CloudFormation",
+		Name:                  "cloudformation",
+		Family:                []string{"cloudformation"},
+		Runtime:               "cloudformation",
+		Kind:                  "api",
+		Title:                 "AWS CloudFormation",
+		TechnologyUrlSegments: []string{"iac", "cloudformation", "template"},
 	}
 
 	projectPath, ok := asset.Connections[0].Options["path"]

diff --git a/providers/github/config/config.go b/providers/github/config/config.go
@@ -76,7 +76,7 @@ var Config = plugin.Provider{
 	},
 	AssetUrlTrees: []*inventory.AssetUrlBranch{
 		{
-			PathSegments: []string{"technology=github"},
+			PathSegments: []string{"technology=saas", "provider=github"},
 			Key:          "organization",
 			Title:        "Organization",
 			Values: map[string]*inventory.AssetUrlBranch{

diff --git a/providers/github/connection/platform.go b/providers/github/connection/platform.go
@@ -77,19 +77,19 @@ func (c *GithubConnection) PlatformInfo() (*inventory.Platform, error) {
 
 func NewGithubOrgPlatform(orgId string) *inventory.Platform {
 	pf := GithubOrgPlatform
-	pf.TechnologyUrlSegments = []string{"github", "organization", orgId, "organization"}
+	pf.TechnologyUrlSegments = []string{"saas", "github", "organization", orgId, "organization"}
 	return &pf
 }
 
 func NewGithubUserPlatform(userId string) *inventory.Platform {
 	pf := GithubUserPlatform
-	pf.TechnologyUrlSegments = []string{"github", "user"}
+	pf.TechnologyUrlSegments = []string{"saas", "github", "user"}
 	return &pf
 }
 
 func NewGitHubRepoPlatform(owner, repo string) *inventory.Platform {
 	pf := GithubRepoPlatform
-	pf.TechnologyUrlSegments = []string{"github", "organization", owner, "repository"}
+	pf.TechnologyUrlSegments = []string{"saas", "github", "organization", owner, "repository"}
 	return &pf
 }
 

diff --git a/providers/gitlab/config/config.go b/providers/gitlab/config/config.go
@@ -4,6 +4,7 @@
 package config
 
 import (
+	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
 	"go.mondoo.com/cnquery/v11/providers/gitlab/provider"
 )
@@ -57,4 +58,15 @@ var Config = plugin.Provider{
 			},
 		},
 	},
+	AssetUrlTrees: []*inventory.AssetUrlBranch{
+		{
+			PathSegments: []string{"technology=saas", "provider=gitlab"},
+			Key:          "kind",
+			Title:        "Kind",
+			Values: map[string]*inventory.AssetUrlBranch{
+				"project": nil,
+				"group":   nil,
+			},
+		},
+	},
 }