From 3861b49430704d0723b4781c71f7d6b367726b55 Mon Sep 17 00:00:00 2001
From: Johnny Otsuka <djgoku@icloud.com>
Date: Thu, 29 Jun 2023 12:06:01 -0500
Subject: [PATCH] Bitbucket Cloud: Fix for getting Deployment Environment
 Variables via each.

---
 .../repositories/deploymentEnvironments.py    | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/atlassian/bitbucket/cloud/repositories/deploymentEnvironments.py b/atlassian/bitbucket/cloud/repositories/deploymentEnvironments.py
index 080ab3de2..7d0e45bee 100644
--- a/atlassian/bitbucket/cloud/repositories/deploymentEnvironments.py
+++ b/atlassian/bitbucket/cloud/repositories/deploymentEnvironments.py
@@ -159,31 +159,43 @@ def create(self, key, value, secured):
         data = {"key": key, "value": value, "secured": secured}
         return self.__get_object(self.post(None, data=data))
 
-    def each(self, q=None, sort=None):
+    def each(self, pagelen=10):
         """
         Returns the list of deployment environment variables in this repository.
 
-        :param q: string: Query string to narrow down the response.
+        :param pagelen: integer: Query string to return this number of items from api.
                           See https://developer.atlassian.com/bitbucket/api/2/reference/meta/filtering for details.
-        :param sort: string: Name of a response property to sort results.
-                             See https://developer.atlassian.com/bitbucket/api/2/reference/meta/filtering for details.
 
-        :return: A generator for the DeploymentEnvironmentVariable objects
+        :return: A list of DeploymentEnvironmentVariable objects
 
         API docs: https://developer.atlassian.com/cloud/bitbucket/rest/api-group-pipelines/#api-repositories-workspace-repo-slug-deployments-config-environments-environment-uuid-variables-get
         """
         params = {}
-        if sort is not None:
-            params["sort"] = sort
-        if q is not None:
-            params["q"] = q
-        for deployment_environment_variable in self._get_paged(
-            None,
-            params=params,
-        ):
-            yield self.__get_object(deployment_environment_variable)
-
-        return
+        params["pagelen"] = pagelen
+
+        response = super(BitbucketCloudBase, self).get(None, params=params)
+
+        pagelen = response.get("pagelen")
+        size_total = response.get("size")
+        pagelen_total = response.get("pagelen")
+        page = 1
+
+        deployment_environment_variables = []
+
+        # workaround for this issue
+        # https://jira.atlassian.com/browse/BCLOUD-20796
+        while True:
+            for value in response.get("values", []):
+                deployment_environment_variables.append(self.__get_object(value))
+
+            if pagelen_total < size_total:
+                pagelen_total = pagelen_total + response["pagelen"]
+                page = page + 1
+                response = super(BitbucketCloudBase, self).get(None, params={"pagelen": pagelen, "page": page})
+            else:
+                break
+
+        return deployment_environment_variables
 
 
 class DeploymentEnvironmentVariable(BitbucketCloudBase):