✨ rename fleet => inventory

This better matches the more commonly used definition. We will keep fleet working for the next major version and then slowly deprecate it. Analogous to: mondoohq/cnquery#1920 Signed-off-by: Dominik Richter <[email protected]>
mondoohq · Sep 25, 2023 · b0476e2 · b0476e2
1 parent 997093e
commit b0476e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/apps/cnspec/cmd/scan.go b/apps/cnspec/cmd/scan.go
@@ -52,7 +52,7 @@ func init() {
 
 	// v6 should make detect-cicd and category flag public
 	scanCmd.Flags().Bool("detect-cicd", true, "Try to detect CI/CD environments. If detected, set the asset category to 'cicd'.")
-	scanCmd.Flags().String("category", "fleet", "Set the category for the assets to 'fleet|cicd'.")
+	scanCmd.Flags().String("category", "inventory", "Set the category for the assets to 'inventory|cicd'.")
 	scanCmd.Flags().MarkHidden("category")
 }
 

diff --git a/apps/cnspec/cmd/vuln.go b/apps/cnspec/cmd/vuln.go
@@ -56,7 +56,7 @@ var vulnCmd = &cobra.Command{
 
 // 		// v6 should make detect-cicd and category flag public, default for "detect-cicd" should switch to true
 // 		cmd.Flags().Bool("detect-cicd", true, "Try to detect CI/CD environments. If successful, sets the asset category to 'cicd'.")
-// 		cmd.Flags().String("category", "fleet", "Set the category for the assets to 'fleet|cicd'.")
+// 		cmd.Flags().String("category", "inventory", "Set the category for the assets to 'inventory|cicd'.")
 // 		cmd.Flags().MarkHidden("category")
 
 // 		// output rendering

diff --git a/cli/reporter/print_compact.go b/cli/reporter/print_compact.go
@@ -167,15 +167,15 @@ func (r *defaultReporter) printSummary(orderedAssets []assetMrnName) {
 			url := ""
 			if len(orderedAssets) > 1 {
 				// we do not have a space url, so we extract it form the asset url
-				// https://console.mondoo.com/space/fleet/2JtqGyVTZULTW0uwQ5YxXW4nh6Y?spaceId=dazzling-golick-767384
+				// https://console.mondoo.com/space/inventory/2JtqGyVTZULTW0uwQ5YxXW4nh6Y?spaceId=dazzling-golick-767384
 				// an individual asset url wouldn't make sense here
 				// when runnin inside cicd, we create an url for the cicd project
-				spaceUrlRegexp := regexp.MustCompile(`^(http.*)/fleet/[a-zA-Z0-9-]+(\?.+)$`)
+				spaceUrlRegexp := regexp.MustCompile(`^(http.*)/inventory/[a-zA-Z0-9-]+(\?.+)$`)
 				m := spaceUrlRegexp.FindStringSubmatch(assetUrl)
 				if projectId != "" {
 					url = m[1] + "/cicd/jobs" + m[2] + "&projectId=" + projectId
 				} else {
-					url = m[1] + "/fleet" + m[2]
+					url = m[1] + "/inventory" + m[2]
 				}
 
 			} else {

diff --git a/cli/reporter/testdata/report-ubuntu.json b/cli/reporter/testdata/report-ubuntu.json
@@ -38,7 +38,7 @@
       "labels": {
         "mondoo.com/project-id": ""
       },
-      "url": "https://console.mondoo.com/space/fleet/2DRZ1cCWFyTYCArycAXHwvn1oU2?spaceId=dazzling-golick-767384"
+      "url": "https://console.mondoo.com/space/inventory/2DRZ1cCWFyTYCArycAXHwvn1oU2?spaceId=dazzling-golick-767384"
     }
   },
   "bundle": {