backports v8.18.0 (#1345)

Signed-off-by: misterpantz <[email protected]> Signed-off-by: Tim Smith <[email protected]> Co-authored-by: Letha <[email protected]> Co-authored-by: Tim Smith <[email protected]>
mondoohq · Jul 11, 2023 · d4b66ec · d4b66ec
1 parent 10b9349
commit d4b66ec
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
@@ -9,7 +9,7 @@ If items relate to a ...
 
   File paths are Perl 5 Regular Expressions - you can [test](https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
 
-  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](../tree/HEAD/README.md) (on whichever branch you're using).
+  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude README.md (on whichever branch you're using).
 
 - well-formed pattern.
 

diff --git a/.github/actions/spelling/line_forbidden.patterns b/.github/actions/spelling/line_forbidden.patterns
@@ -1,6 +1,14 @@
 # Detect common combinations of valid words that are in fact invalid. 
 # Useful for brand capitalizations
 
+#
+# Our Terms
+#
+
+# s.b. Mondoo Platform
+\sthe Mondoo Platform\b
+\sMondoo platform\b
+
 #
 # Industry Terms
 #
@@ -36,6 +44,9 @@
 # Product Names
 #
 
+# s.b. Firefox
+\bFireFox\b
+
 # s.b. CentOS
 \bCentos\b
 \bCent OS\b
@@ -93,6 +104,10 @@
 \bApparmor\b
 \bApp Armor\b
 
+# s.b. SELinux
+\bSeLinux\b
+\bSelinux\b
+
 # s.b. InSpec
 \b[Ii]nspec\b
 
@@ -133,7 +148,7 @@
 \bGroup Policy object\b
 
 #
-# VMware Product
+# VMware Products
 #
 
 # s.b. VMware
@@ -177,10 +192,9 @@
 \bCloudsearch\b
 
 # s.b. CloudShell
+# we can't check for Cloud Shell since that's what Azure calls it
 \bCloudshell\b
-\bCloud Shell\b
 \bcloudshell\b
-\bcloud shell\b
 
 # s.b. CloudTrail
 \bCloudtrail\b

diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
@@ -61,3 +61,8 @@ uid:\s.*$
 
 # mac user dir path
 \/Users\/\S*
+
+# AWS Token, ID access key, etc
+aws_session_token\s+\=(\s+)?.+
+aws_access_key_id\s+\=(\s+)?.+
+aws_secret_access_key\s+\=(\s+)?.+
diff --git a/resources/packs/core/core.go b/resources/packs/core/core.go
@@ -2,7 +2,7 @@ package core
 
 import "go.mondoo.com/cnquery/resources/packs/core/info"
 
-const MissingUpstreamErr = `To use this resource, you must authenticate with the Mondoo Platform.
+const MissingUpstreamErr = `To use this resource, you must authenticate with Mondoo Platform.
 To learn how, read: 
 https://mondoo.com/docs/cnspec/cnspec-adv-install/registration/`
 

diff --git a/resources/packs/os/services/manager.go b/resources/packs/os/services/manager.go
@@ -113,6 +113,8 @@ func ResolveManager(motor *motor.Motor) (OSServiceManager, error) {
 		} else {
 			osm = ResolveSystemdServiceManager(osProvider)
 		}
+	case pf.Name == "raspbian":
+		osm = ResolveSystemdServiceManager(osProvider)
 	case pf.Name == "suse-microos": // it is suse family but uses a different version scheme
 		osm = ResolveSystemdServiceManager(osProvider)
 	case pf.IsFamily("suse"):