From df550ce4118932cc71949cd821fb70698f3b6f6a Mon Sep 17 00:00:00 2001
From: Kevin James <KevinJames@thekev.in>
Date: Tue, 20 Jul 2021 16:04:18 -0700
Subject: [PATCH] fix(env): fixup handling of default env service values

Fixes the mapping between default (eg. `COVERALLS_*`) env vars and the
equivalent config values, which had some mismatches for job
identification cases.

Fixes #303
---
 coveralls/api.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/coveralls/api.py b/coveralls/api.py
index e9b6d7cf..64f73a9b 100644
--- a/coveralls/api.py
+++ b/coveralls/api.py
@@ -214,21 +214,18 @@ def load_config_from_environment(self):
         if parallel:
             self.config['parallel'] = parallel
 
-        repo_token = os.environ.get('COVERALLS_REPO_TOKEN')
-        if repo_token:
-            self.config['repo_token'] = repo_token
-
-        service_name = os.environ.get('COVERALLS_SERVICE_NAME')
-        if service_name:
-            self.config['service_name'] = service_name
-
-        flag_name = os.environ.get('COVERALLS_FLAG_NAME')
-        if flag_name:
-            self.config['flag_name'] = flag_name
-
-        number = os.environ.get('COVERALLS_SERVICE_JOB_NUMBER')
-        if number:
-            self.config['service_number'] = number
+        fields = {
+            'COVERALLS_FLAG_NAME': 'flag_name',
+            'COVERALLS_REPO_TOKEN': 'repo_token',
+            'COVERALLS_SERVICE_JOB_ID': 'service_job_id',
+            'COVERALLS_SERVICE_JOB_NUMBER': 'service_job_number',
+            'COVERALLS_SERVICE_NAME': 'service_name',
+            'COVERALLS_SERVICE_NUMBER': 'service_number',
+        }
+        for var, key in fields.items():
+            value = os.environ.get(var)
+            if value:
+                self.config[key] = value
 
     def load_config_from_file(self):
         try: