appid: Return early if incorrect code hosting domain found

flathub-infra · Sep 16, 2024 · c2462da · c2462da
1 parent 62f2f23
commit c2462da
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/flatpak_builder_lint/checks/appid.py b/flatpak_builder_lint/checks/appid.py
@@ -46,9 +46,11 @@ def _validate(self, appid: Optional[str], is_extension: bool) -> None:
             if tld != "io" and domain in ("github", "gitlab"):
                 self.errors.add("appid-uses-code-hosting-domain")
                 self.info.add(f"appid-uses-code-hosting-domain: {domain}.{tld}")
+                return
             if tld != "page" and domain == "codeberg":
                 self.errors.add("appid-uses-code-hosting-domain")
                 self.info.add(f"appid-uses-code-hosting-domain: {domain}.{tld}")
+                return
             if len(split) < 4:
                 self.errors.add("appid-code-hosting-too-few-components")
                 return

diff --git a/tests/manifests/appid-too-few-cpts.json b/tests/manifests/appid-too-few-cpts.json
@@ -0,0 +1,3 @@
+{
+    "app-id": "io.github.foo"
+}
diff --git a/tests/test_manifest.py b/tests/test_manifest.py
@@ -112,14 +112,22 @@ def test_manifest_toplevel() -> None:
 def test_manifest_appid() -> None:
     errors = {
         "appid-filename-mismatch",
-        "appid-code-hosting-too-few-components",
         "appid-uses-code-hosting-domain",
     }
     ret = run_checks("tests/manifests/appid.json")
     found_errors = set(ret["errors"])
     assert errors.issubset(found_errors)
 
 
+def test_manifest_appid() -> None:
+    errors = {
+        "appid-code-hosting-too-few-components",
+    }
+    ret = run_checks("tests/manifests/appid-too-few-cpts.json")
+    found_errors = set(ret["errors"])
+    assert errors.issubset(found_errors)
+
+
 def test_manifest_flathub_json() -> None:
     errors = {
         "flathub-json-skip-appstream-check",