Merge ~pfsmorigo/review-tools:pfsmorigo/add_microk8s_username into review-tools:master

[Paulo Flabiano Smorigo]

[Alex Murray (alexmurray)]

LGTM, thanks @pfsmorigo.

review: Approve

[Ian Johnson (anonymouse67)]

This LGTM

[Ian Johnson (anonymouse67)]

(forgot to change the review type to approve)

review: Approve

diff --git a/reviewtools/overrides.py b/reviewtools/overrides.py
index 7427c90..5463685 100644
--- a/reviewtools/overrides.py
+++ b/reviewtools/overrides.py
@@ -922,7 +922,7 @@ lint_redflagged_base_dep_override = {
 # For a given snapd_<username>, list the snaps that are allowed to
 # specify it. Note, as a special case, 'snap_daemon' may be used
 # by any snap and is not tracked here.
-lint_system_usernames_override = {"snap_docker": ["docker"]}
+lint_system_usernames_override = {"snap_microk8s": ["microk8s"]}
 
 # Some publisher_emails represent a shared account. For snaps with a shared
 # email, also send to other addresses.
diff --git a/reviewtools/sr_common.py b/reviewtools/sr_common.py
index 58941ac..8d3685d 100644
--- a/reviewtools/sr_common.py
+++ b/reviewtools/sr_common.py
@@ -189,7 +189,7 @@ class SnapReview(Review):
     # IMPORTANT: anything listed here is assumed to be usable by all
     # snaps. If use of the username should be limited to specific
     # snaps, also adjust overrides.py:lint_system_usernames_override.
-    valid_system_usernames = ["snap_daemon", "snap_docker"]
+    valid_system_usernames = ["snap_daemon", "snap_microk8s"]
 
     valid_compiled_architectures = [
         "amd64",
diff --git a/reviewtools/tests/test_sr_lint.py b/reviewtools/tests/test_sr_lint.py
index 8e303a4..abd970f 100644
--- a/reviewtools/tests/test_sr_lint.py
+++ b/reviewtools/tests/test_sr_lint.py
@@ -5850,9 +5850,9 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
         }
         self.check_results(r, expected=expected)
 
-    def test_check_system_usernames_unsupported_snap_docker_user_for_generic_snap(self):
+    def test_check_system_usernames_unsupported_snap_microk8s_user_for_generic_snap(self):
         """Test check_system_usernames - unsupported user"""
-        d = {"snap_docker": "shared"}
+        d = {"snap_microk8s": "shared"}
         self.set_test_snap_yaml("system-usernames", d)
         c = SnapReviewLint(self.test_name)
         c.check_system_usernames()
@@ -5861,8 +5861,8 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
         self.check_results(r, expected_counts)
         expected = {
             "error": {
-                "lint-snap-v2:system-usernames:snap_docker": {
-                    "text": "unsupported system-username: snap_docker for snap foo"
+                "lint-snap-v2:system-usernames:snap_microk8s": {
+                    "text": "unsupported system-username: snap_microk8s for snap foo"
                 }
             },
             "warn": {},
@@ -5874,15 +5874,15 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
         """Test check_system_usernames overrides"""
         from reviewtools.overrides import lint_system_usernames_override
 
-        lint_system_usernames_override["snap_docker"].append("foo")
+        lint_system_usernames_override["snap_microk8s"].append("foo")
 
         self.set_test_snap_yaml("name", "foo")
-        self.set_test_snap_yaml("system-usernames", {"snap_docker": "shared"})
+        self.set_test_snap_yaml("system-usernames", {"snap_microk8s": "shared"})
         c = SnapReviewLint(self.test_name)
         c.check_system_usernames()
 
         # then cleanup the overrides
-        lint_system_usernames_override["snap_docker"].remove("foo")
+        lint_system_usernames_override["snap_microk8s"].remove("foo")
 
         r = c.review_report
         expected_counts = {"info": 2, "warn": 0, "error": 0}
@@ -5893,8 +5893,8 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
             "warn": {},
             "info": {
                 "lint-snap-v2:system-usernames_valid": {"text": "OK"},
-                "lint-snap-v2:system-usernames:snap_docker": {
-                    "text": "OK (override snap_docker for snap: foo)"
+                "lint-snap-v2:system-usernames:snap_microk8s": {
+                    "text": "OK (override snap_microk8s for snap: foo)"
                 },
             },
         }