fix: Fix harness ci slug parsing

Author: calvin-codecov

codecov-cli/codecov_cli/helpers/ci_adapters/harness.py

@@ -30,25 +30,14 @@ def _get_build_url(self):
         return os.getenv("CI_BUILD_LINK")
 
     def _get_slug(self):
-        # DRONE_REPO is the canonical org/repo slug on Harness CI (Drone-compatible).
-        # CI_REPO is often equivalent but some setups only set the repo name; then use
-        # DRONE_REPO_NAMESPACE + DRONE_REPO_NAME (or short CI_REPO as the name part).
-        if drone_repo := os.getenv("DRONE_REPO"):
-            return drone_repo
         ci_repo = os.getenv("CI_REPO")
         if ci_repo and "/" in ci_repo:
             return ci_repo
-        namespace = os.getenv("DRONE_REPO_NAMESPACE") or os.getenv("CI_REPO_NAMESPACE")
-        name = os.getenv("DRONE_REPO_NAME") or (
-            ci_repo if ci_repo and "/" not in ci_repo else None
-        )
-        if namespace and name:
-            return f"{namespace}/{name}"
-        # Many Harness builds omit CI_REPO / *_NAMESPACE but still set clone/remotes:
-        # https://developer.harness.io/docs/continuous-integration/troubleshoot-ci/ci-env-var/
         for env_var in (
-            "DRONE_GIT_HTTP_URL",
             "CI_REPO_REMOTE",
+            "CI_REMOTE_URL",
+            "CI_REPO_LINK",
+            "DRONE_GIT_HTTP_URL",
             "DRONE_REMOTE_URL",
         ):
             if url := os.getenv(env_var):

codecov-cli/tests/ci_adapters/test_harnessci.py

@@ -11,18 +11,15 @@ class HarnessEnvEnum(str, Enum):
     HARNESS_BUILD_ID = "HARNESS_BUILD_ID"
     CI_BUILD_LINK = "CI_BUILD_LINK"
     CI_BUILD_NUMBER = "CI_BUILD_NUMBER"
+    CI_REMOTE_URL = "CI_REMOTE_URL"
     CI_REPO = "CI_REPO"
-    CI_REPO_NAMESPACE = "CI_REPO_NAMESPACE"
-    DRONE = "DRONE"
+    CI_REPO_LINK = "CI_REPO_LINK"
+    CI_REPO_REMOTE = "CI_REPO_REMOTE"
     DRONE_COMMIT_BRANCH = "DRONE_COMMIT_BRANCH"
     DRONE_COMMIT_SHA = "DRONE_COMMIT_SHA"
     DRONE_PULL_REQUEST = "DRONE_PULL_REQUEST"
     DRONE_GIT_HTTP_URL = "DRONE_GIT_HTTP_URL"
     DRONE_REMOTE_URL = "DRONE_REMOTE_URL"
-    DRONE_REPO = "DRONE_REPO"
-    DRONE_REPO_NAME = "DRONE_REPO_NAME"
-    DRONE_REPO_NAMESPACE = "DRONE_REPO_NAMESPACE"
-    CI_REPO_REMOTE = "CI_REPO_REMOTE"
 
 class TestHarnessCI(object):
     @pytest.mark.parametrize(
@@ -101,30 +98,26 @@ def test_build_url(self, env_dict, expected, mocker):
         "env_dict,expected",
         [
             ({}, None),
-            ({HarnessEnvEnum.DRONE_REPO: "owner/repo"}, "owner/repo"),
             ({HarnessEnvEnum.CI_REPO: "owner/repo"}, "owner/repo"),
+            ({HarnessEnvEnum.CI_REPO: "repo"}, None),
             (
                 {
-                    HarnessEnvEnum.DRONE_REPO_NAMESPACE: "owner",
-                    HarnessEnvEnum.DRONE_REPO_NAME: "repo",
+                    HarnessEnvEnum.CI_REPO_REMOTE: "https://gitlab.com/mygroup/myrepo.git",
                 },
-                "owner/repo",
+                "mygroup/myrepo",
             ),
             (
                 {
-                    HarnessEnvEnum.DRONE_REPO_NAMESPACE: "owner",
-                    HarnessEnvEnum.CI_REPO: "repo",
+                    HarnessEnvEnum.CI_REMOTE_URL: "https://github.com/from-remote-url/from-remote-url",
                 },
-                "owner/repo",
+                "from-remote-url/from-remote-url",
             ),
             (
                 {
-                    HarnessEnvEnum.CI_REPO_NAMESPACE: "owner",
-                    HarnessEnvEnum.CI_REPO: "repo",
+                    HarnessEnvEnum.CI_REPO_LINK: "https://github.com/from-repo-link/from-repo-link",
                 },
-                "owner/repo",
+                "from-repo-link/from-repo-link",
             ),
-            ({HarnessEnvEnum.CI_REPO: "repo"}, None),
             (
                 {
                     HarnessEnvEnum.DRONE_GIT_HTTP_URL: "https://github.com/myorg/myrepo.git",
@@ -133,15 +126,16 @@ def test_build_url(self, env_dict, expected, mocker):
             ),
             (
                 {
-                    HarnessEnvEnum.CI_REPO_REMOTE: "https://gitlab.com/mygroup/myrepo.git",
+                    HarnessEnvEnum.DRONE_REMOTE_URL: "git@github.com:acme/coverage.git",
                 },
-                "mygroup/myrepo",
+                "acme/coverage",
             ),
             (
                 {
-                    HarnessEnvEnum.DRONE_REMOTE_URL: "git@github.com:acme/coverage.git",
+                    HarnessEnvEnum.CI_REPO_REMOTE: "https://github.com/first/first.git",
+                    HarnessEnvEnum.DRONE_GIT_HTTP_URL: "https://github.com/second/second.git",
                 },
-                "acme/coverage",
+                "first/first",
             ),
         ],
     )