[ENG-6035] | Bitbucket Storage Addon Implementation #135
Conversation
addon_imps/storage/bitbucket.py
Outdated
| async with self.network.GET("user/permissions/workspaces") as response: | ||
| data = await response.json_content() | ||
| workspaces = data.get("values", []) | ||
| if not workspaces: | ||
| raise ValueError("No workspaces found") | ||
|
|
||
| for workspace in workspaces: | ||
| slug = workspace["workspace"]["slug"] | ||
| perm = workspace.get("permission") | ||
| if perm in ["admin", "contributor", "member", "owner"]: | ||
| self.workspace_slug = slug | ||
| break | ||
| else: | ||
| raise ValueError("No suitable workspace found") |
There was a problem hiding this comment.
may you explain the reason behind this?
Because uuid is being obtained higher and isn't manipulated on commented lines
There was a problem hiding this comment.
Sure, so basically the reason for fetching the user's workspaces and setting self.workspace_slug is that we need to identify a workspace where the user has sufficient permissions (admin, contributor, member, or owner) to perform subsequent API operations. The uuid obtained earlier identifies the user but doesn't provide the necessary context for workspace-specific actions. By selecting an appropriate workspace_slug, we ensure that our API requests target a workspace the user can access.
There was a problem hiding this comment.
Okay, I get where you are coming from but I still have my reservations:
- Won't workspace slug be lost if you set it as a property of addon imp?
- If you have multiple workpaces you overwrite workspace slug with the last one in response.
- I'd suggest to work with workspaces as with top-level folders (aka root items) and include them in navigation
There was a problem hiding this comment.
You're right, appreciate you pointing this out. Working on this changes
addon_imps/storage/bitbucket.py
Outdated
| except Exception as e: | ||
| raise ValueError(f"Failed to fetch item info: {e}") |
There was a problem hiding this comment.
http client will raise only when it obtains 50* status code, I'd advice to handle 40* status codes instead
There was a problem hiding this comment.
You're right. I'll update the code to explicitly handle 4xx status codes, since the HTTP client only raises exceptions for 5xx errors.
sh-andriy
force-pushed
the
feature/ENG-6035
branch
from
dfb7b42 to
ab5aedb
Compare
addon_imps/storage/bitbucket.py
Outdated
| repo_full_name, path_param = self._split_repo_full_name_and_path(actual_id) | ||
| endpoint = f"repositories/{repo_full_name}/src/HEAD/{path_param}" | ||
| try: | ||
| async with self.network.GET(endpoint, query=params) as response: | ||
| json_data = await self._handle_response(response) | ||
| except Exception as e: | ||
| raise ValueError(f"Failed to list child items: {e}") | ||
| items = [] | ||
| for item in json_data.get("values", []): | ||
| item_type_value = ( | ||
| storage.ItemType.FOLDER | ||
| if item["type"] == "commit_directory" | ||
| else storage.ItemType.FILE | ||
| ) | ||
| if item_type is not None and item_type != item_type_value: | ||
| continue | ||
| path = item.get("path") | ||
| if not path: | ||
| continue | ||
| item_name = path.split("/")[-1] or "Unnamed Item" | ||
| item_id_value = self._make_item_id( | ||
| "repository", f"{repo_full_name}/{path}" | ||
| ) | ||
| items.append( | ||
| storage.ItemResult( | ||
| item_id=item_id_value, | ||
| item_name=item_name, | ||
| item_type=item_type_value, | ||
| ) | ||
| ) | ||
| result = storage.ItemSampleResult(items=items) | ||
| next_cursor = json_data.get("next") | ||
| cursor = NextLinkCursor(next_link=next_cursor) | ||
| result = result.with_cursor(cursor) | ||
| return result | ||
| else: | ||
| raise ValueError(f"Cannot list child items for item type {item_type_str}") |
There was a problem hiding this comment.
Please, extract this to separate method as list_child_items becomes too long
addon_imps/storage/bitbucket.py
Outdated
| workspace_slug = actual_id | ||
| params["role"] = "member" | ||
| params["pagelen"] = "100" | ||
| endpoint = f"repositories/{workspace_slug}" | ||
| try: | ||
| async with self.network.GET(endpoint, query=params) as response: | ||
| json_data = await self._handle_response(response) | ||
| except Exception as e: | ||
| raise ValueError(f"Failed to fetch repositories: {e}") | ||
| items = [] | ||
| for repo in json_data.get("values", []): | ||
| full_name = repo.get("full_name") | ||
| name = repo.get("name") or "Unnamed Repository" | ||
| if not full_name: | ||
| continue | ||
| item_id = self._make_item_id("repository", full_name) | ||
| items.append( | ||
| storage.ItemResult( | ||
| item_id=item_id, | ||
| item_name=name, | ||
| item_type=storage.ItemType.FOLDER, | ||
| ) | ||
| ) | ||
| result = storage.ItemSampleResult(items=items) | ||
| next_cursor = json_data.get("next") | ||
| cursor = NextLinkCursor(next_link=next_cursor) | ||
| result = result.with_cursor(cursor) | ||
| return result |
There was a problem hiding this comment.
Also extract this, please
addon_imps/storage/bitbucket.py
Outdated
| result = storage.ItemSampleResult(items=items) | ||
| next_cursor = json_data.get("next") | ||
| cursor = NextLinkCursor(next_link=next_cursor) | ||
| result = result.with_cursor(cursor) | ||
| return result |
There was a problem hiding this comment.
this may be deduplicated
sh-andriy
force-pushed
the
feature/ENG-6035
branch
from
25b1116 to
0e28d24
Compare
Bitbucket Storage Addon Implementation PR |
[ENG-6035]