Merge pull request #29 from scality/bugfix/BERTE-547/github-action-stastus-error

[berte-547] GitHub action status error

Author: tcarmet

CHANGELOG

@@ -1,12 +1,14 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [3.6.1] - 2021-05-26
+# Fixed
+- API call error was returning to much information, now it return only action results.
+
 ## [3.6.0] - 2021-04-27
 # Added
 - Support GitHub Action CI thanks to a new build key config `github_actions`
 
-
-
 ## [3.5.0] - 2021-04-27
 # Added
 - Add "pr_author_options" option to config, which add bypass to a specifique user

bert_e/git_host/github/__init__.py

@@ -355,9 +355,9 @@ def get_commit_status(self, ref):
                                             owner=self.owner,
                                             repo=self.slug, ref=ref)
 
-            actions = AggregatedCheckSuites.get(self.client,
-                                                owner=self.owner,
-                                                repo=self.slug, ref=ref)
+            actions = AggregatedCheckRuns.get(self.client,
+                                              owner=self.owner,
+                                              repo=self.slug, ref=ref)
             combined.status[actions.key] = actions
 
         except HTTPError as err:
@@ -507,62 +507,41 @@ def __str__(self) -> str:
         return self.state
 
 
-class AggregatedCheckRuns(base.AbstractGitHostObject):
+class AggregatedCheckRuns(base.AbstractGitHostObject,
+                          base.AbstractBuildStatus):
+
     """
     The Endpoint to have access infos about github actions runs
     """
     GET_URL = '/repos/{owner}/{repo}/commits/{ref}/check-runs'
     SCHEMA = schema.AggregateCheckRuns
 
-    @property
-    def html_url(self):
-        if self.data['total_count']:
-            return self.data['check_runs'][0]['html_url']
-        return ''
-
-
-class AggregatedCheckSuites(base.AbstractGitHostObject,
-                            base.AbstractBuildStatus):
-    """
-    The Endpoint to have access infos about github actions suites
-    """
-    GET_URL = '/repos/{owner}/{repo}/commits/{ref}/check-suites'
-    SCHEMA = schema.AggregateCheckSuites
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self._check_suites = [elem for elem in self.data['check_suites']]
-
-    @classmethod
-    def get(cls, client, url=None, params={}, headers={}, **kwargs):
-        res = super(AggregatedCheckSuites, cls)\
-            .get(client, url, params, headers, **kwargs)
-
-        html_url = AggregatedCheckRuns\
-            .get(client, url, params, headers, **kwargs).html_url
-        res.data['html_url'] = html_url
-        return res
+        self._check_runs = [elem for elem in self.data['check_runs']]
 
     @property
     def url(self):
-        return self.data['html_url']
+        if len(self.data['check_runs']):
+            return self.data['check_runs'][0]['html_url']
+        return ''
 
     @property
     def state(self):
         queued = any(
-            elem['status'] == 'queued' for elem in self._check_suites
+            elem['status'] == 'queued' for elem in self._check_runs
         )
         all_complete = all(
-            elem['status'] == 'completed' for elem in self._check_suites
+            elem['status'] == 'completed' for elem in self._check_runs
         )
         all_success = all(
-            elem['conclusion'] == 'success' for elem in self._check_suites
+            elem['conclusion'] == 'success' for elem in self._check_runs
         )
-        if self._check_suites.__len__() > 0 and queued:
+        if self._check_runs.__len__() > 0 and queued:
             return 'NOTSTARTED'
-        elif self._check_suites.__len__() > 0 and not all_complete:
+        elif self._check_runs.__len__() > 0 and not all_complete:
             return 'INPROGRESS'
-        elif self._check_suites.__len__() > 0 and all_complete and all_success:
+        elif self._check_runs.__len__() > 0 and all_complete and all_success:
             return 'SUCCESSFUL'
         else:
             return 'FAILED'
@@ -577,8 +556,8 @@ def key(self) -> str:
 
     @property
     def commit(self):
-        if self._check_suites.__len__() > 0:
-            return self._check_suites[0]["head_sha"]
+        if self._check_runs.__len__() > 0:
+            return self._check_runs[0]["head_sha"]
         else:
             return None
 

bert_e/git_host/github/schema.py

@@ -78,18 +78,6 @@ class Branch(Schema):
     repo = fields.Nested(Repo)
 
 
-class CheckSuites(Schema):
-    id = fields.Integer()
-    head_sha = fields.Str()
-    status = fields.Str()
-    conclusion = fields.Str(allow_none=True)
-
-
-class AggregateCheckSuites(Schema):
-    total_count = fields.Integer()
-    check_suites = fields.Nested(CheckSuites, many=True)
-
-
 class CheckRuns(Schema):
     id = fields.Integer()
     head_sha = fields.Str()