diff --git a/.gitignore b/.gitignore index 4fb0350..f4f5948 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +/secrets /configs/remmina __pycache__ \ No newline at end of file diff --git a/configs/scripts/github-to-trello b/configs/scripts/github-to-trello new file mode 100755 index 0000000..cbb19bc --- /dev/null +++ b/configs/scripts/github-to-trello @@ -0,0 +1,163 @@ +#! /usr/bin/env python3 + +# fmt:off +import sys +import os +from pathlib import Path +sys.path.append((Path(os.environ["EWCONFIG_ROOT"]) / "python_modules").as_posix()) +# fmt:on + +import argparse +import sys +import logging +import requests +from pathlib import Path +from dataclasses import dataclass, field +from typing import List, Optional, Dict, Any +from ewconfig.secret_manager import get_semi_secret_string +from ewconfig.trello import TRELLO_API_KEY, get_trello_api_token +from ewconfig.trello.cards import get_all_trello_cards, create_card, add_attachment +from ewconfig.trello.boards import PERSONAL_TASKS_BOARD + +logger = logging.getLogger(__name__) + +GITHUB_API_VERSION = "2022-11-28" +GITHUB_PAT = get_semi_secret_string("github_pat", namespace="trello-sync") +TRELLO_API_TOKEN = get_trello_api_token() + + +def get_all_issues() -> List[Dict[str, Any]]: + issues = [] + + # Get all issues assigned to me + response = requests.get( + "https://api.github.com/issues", + headers={ + "Authorization": f"token {GITHUB_PAT}", + "Accept": "application/vnd.github.raw+json", + "X-GitHub-Api-Version": GITHUB_API_VERSION, + }, + params={"state": "open", "per_page": 100}, + ) + response.raise_for_status() + issues.extend(response.json()) + + # Get all issues that mention me + response = requests.get( + "https://api.github.com/user/issues", + headers={ + "Authorization": f"token {GITHUB_PAT}", + "Accept": "application/vnd.github.raw+json", + "X-GitHub-Api-Version": GITHUB_API_VERSION, + }, + params={"state": "open", "per_page": 100, "filter": "mentioned"}, + ) + response.raise_for_status() + issues.extend(response.json()) + + # Get all issues that exist in my repos + response = requests.get( + "https://api.github.com/user/issues", + headers={ + "Authorization": f"token {GITHUB_PAT}", + "Accept": "application/vnd.github.raw+json", + "X-GitHub-Api-Version": GITHUB_API_VERSION, + }, + params={"state": "open", "per_page": 100, "filter": "repos"}, + ) + response.raise_for_status() + issues.extend(response.json()) + + # De-dupe issues + issues = list({issue["id"]: issue for issue in issues}.values()) + + return issues + + +def main() -> int: + # Handle program arguments + ap = argparse.ArgumentParser(prog="", description="") + ap.add_argument("--dry-run", help="Don't actually do anything", action="store_true") + ap.add_argument( + "-v", "--verbose", help="Enable verbose logging", action="store_true" + ) + args = ap.parse_args() + + # Configure logging + logging.basicConfig( + level=logging.DEBUG if args.verbose else logging.INFO, + format="%(levelname)s: %(message)s", + ) + + # Get a list of all issues assigned to me + my_issues = get_all_issues() + logger.info(f"Found {len(my_issues)} issues assigned to me") + + # Get all cards on the personal tasks board + trello_cards = get_all_trello_cards( + board_id=PERSONAL_TASKS_BOARD.id, + api_key=TRELLO_API_KEY, + api_token=TRELLO_API_TOKEN, + ) + logger.info(f"Found {len(trello_cards)} cards in Trello") + + # Handle each GitHub issue + for issue in my_issues: + # Ignore archived repos + if issue["repository"]["archived"]: + logger.info(f"Ignoring archived repo: {issue['repository']['full_name']}") + continue + + # Ignore anything by dependabot + if issue["user"]["login"] == "dependabot[bot]": + logger.debug(f"Ignoring dependabot issue: {issue['repository']['full_name']}#{issue['number']}") + continue + + # Search each card for anything that links to the github issue + for card in trello_cards: + if issue["html_url"] in card["desc"]: + logger.info( + f"Found GitHub Issue {issue['number']} in Trello Card {card['id']}" + ) + break + else: + logger.info( + f"Going to create trello card for GitHub Issue: [{issue['repository']['full_name']}] {issue['title']}" + ) + if not args.dry_run: + # Check if this is an issue or pr + is_pr = "pull_request" in issue + type_label = ( + PERSONAL_TASKS_BOARD.tags["Github: Pull Request"] + if is_pr + else PERSONAL_TASKS_BOARD.tags["Github: Issue"] + ) + + # Create a new trello card for this issue + card_id = create_card( + list_id=PERSONAL_TASKS_BOARD.lists["To Do"], + name=f"[{issue['repository']['full_name']}] {issue['title']}", + description=( + f"**GitHub Link:** [`{issue['repository']['full_name']}#{issue['number']}`]({issue['html_url']})\n\n" + f"**Author:** [`{issue['user']['login']}`]({issue['user']['html_url']})\n\n" + "---" + ), + label_ids=[type_label], + api_key=TRELLO_API_KEY, + api_token=TRELLO_API_TOKEN, + ) + add_attachment( + card_id=card_id, + api_key=TRELLO_API_KEY, + api_token=TRELLO_API_TOKEN, + url=issue["html_url"], + ) + logger.info( + f"Created Trello Card {card_id} for GitHub Issue {issue['repository']['full_name']}#{issue['number']}" + ) + + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/configs/scripts/guru-sync-issues b/configs/scripts/guru-sync-issues index c968415..f16e889 100755 --- a/configs/scripts/guru-sync-issues +++ b/configs/scripts/guru-sync-issues @@ -1,4 +1,12 @@ #! /usr/bin/env python3 + +# fmt:off +import sys +import os +from pathlib import Path +sys.path.append((Path(os.environ["EWCONFIG_ROOT"]) / "python_modules").as_posix()) +# fmt:on + import argparse import sys import logging @@ -9,41 +17,19 @@ from pathlib import Path from typing import List, Optional, Dict, Any from enum import Enum, auto from datetime import datetime +from ewconfig.secret_manager import get_semi_secret_string +from ewconfig.trello import TRELLO_API_KEY, get_trello_api_token +from ewconfig.trello.cards import get_all_trello_cards, create_card +from ewconfig.trello.boards import PERSONAL_TASKS_BOARD logger = logging.getLogger(__name__) -GITLAB_PAT_FILE_PATH = Path("~/.config/guru-sync-issues/gitlab_pat.txt").expanduser() +GITLAB_PAT_FILE_PATH = get_semi_secret_string( + "guru_gitlab_pat", namespace="trello-sync" +) GITLAB_ENDPOINT = "http://gitlab.guru-domain.gurustudio.com/api/v4" MY_USER_ID = 64 -TRELLO_API_TOKEN_FILE_PATH = Path( - "~/.config/guru-sync-issues/trello_api_token.txt" -).expanduser() -TRELLO_API_KEY = "fba640a85f15c91e93e6b3f88e59489c" -TRELLO_BOARD = "tw3Cn3L6" -TRELLO_TODO_LIST = "6348a3ce5208f505b61d29bf" -TRELLO_LABELS = { - "GURU": "64e03ac77d27032282436d28" -} - -# Load the PAT -try: - with open(GITLAB_PAT_FILE_PATH) as f: - GITLAB_PAT = f.read().strip() -except FileNotFoundError: - logger.error( - f"Could not find GitLab PAT file at {GITLAB_PAT_FILE_PATH}. Please create it and try again." - ) - sys.exit(1) - -# Load Trello key -try: - with open(TRELLO_API_TOKEN_FILE_PATH) as f: - TRELLO_API_TOKEN = f.read().strip() -except FileNotFoundError: - logger.error( - f"Could not find Trello API key file at {TRELLO_API_TOKEN_FILE_PATH}. Please create it and try again." - ) - sys.exit(1) +TRELLO_API_TOKEN = get_trello_api_token() TrelloCardId = str @@ -101,19 +87,6 @@ def get_personal_gitlab_issues(user_id: int = MY_USER_ID) -> List[GitLabIssue]: return output -def get_all_trello_cards() -> List[Dict[str, Any]]: - # Get a list of cards on the board - response = requests.get( - f"https://api.trello.com/1/boards/{TRELLO_BOARD}/cards", - params={ - "key": TRELLO_API_KEY, - "token": TRELLO_API_TOKEN, - }, - ) - response.raise_for_status() - return response.json() - - def find_or_create_trello_issue_for( trello_cards: List[Dict[str, Any]], gitlab_issue: GitLabIssue ) -> TrelloCardId: @@ -141,26 +114,20 @@ def find_or_create_trello_issue_for( [ f"**Sync Metadata:** `{json.dumps({'ns': 'guru-gitlab', 'ids': [gitlab_issue.global_id]})}`", f"**GitLab Issue:** [`{gitlab_issue.reference_string}`]({gitlab_issue.web_url})\n", - "---" + "---", ] ) # Make a new card - response = requests.post( - "https://api.trello.com/1/cards", - params={ - "idList": TRELLO_TODO_LIST, - "name": gitlab_issue.title, - "desc": card_description, - "idLabels": ",".join([TRELLO_LABELS["GURU"]]), - "pos": "top", - "key": TRELLO_API_KEY, - "token": TRELLO_API_TOKEN, - }, + return create_card( + list_id=PERSONAL_TASKS_BOARD.lists["To Do"], + name=gitlab_issue.title, + description=card_description, + label_ids=[PERSONAL_TASKS_BOARD.tags["GURU"]], + position="top", + api_key=TRELLO_API_KEY, + api_token=TRELLO_API_TOKEN, ) - response.raise_for_status() - - return response.json()["id"] def main() -> int: @@ -183,7 +150,11 @@ def main() -> int: logger.info(f"Found {len(issues)} issues") # Get a list of cards on the board - trello_cards = get_all_trello_cards() + trello_cards = get_all_trello_cards( + board_id=PERSONAL_TASKS_BOARD.id, + api_key=TRELLO_API_KEY, + api_token=TRELLO_API_TOKEN, + ) logger.info(f"Found {len(trello_cards)} cards on the board") # Handle each issue diff --git a/python_modules/ewconfig/secret_manager.py b/python_modules/ewconfig/secret_manager.py new file mode 100644 index 0000000..e76ae72 --- /dev/null +++ b/python_modules/ewconfig/secret_manager.py @@ -0,0 +1,24 @@ +import logging +from pathlib import Path +from typing import Optional + +SEMI_SECRET_BASE_PATH = Path("~/.config/ewconfig/secrets/semi-secret").expanduser() + +logger = logging.getLogger(__name__) + +def get_semi_secret_string(name: str, namespace: Optional[str] = None) -> str: + logger.debug(f"Attempting to load secret: {name} (ns: {namespace})") + + # Construct file path + file = SEMI_SECRET_BASE_PATH + if namespace: + file = file / namespace + file = file / name + + # Make sure it exists + if not file.exists(): + raise FileNotFoundError(f"Could not load secret from: {file}") + + # Read the value + with open(file, "r") as f: + return f.read().strip() diff --git a/python_modules/ewconfig/trello/__init__.py b/python_modules/ewconfig/trello/__init__.py new file mode 100644 index 0000000..f22a8a7 --- /dev/null +++ b/python_modules/ewconfig/trello/__init__.py @@ -0,0 +1,8 @@ +from ..secret_manager import get_semi_secret_string + +TRELLO_API_KEY = "fba640a85f15c91e93e6b3f88e59489c" +"""Public api key to do things to personal Trello""" + + +def get_trello_api_token() -> str: + return get_semi_secret_string("trello_api_token") diff --git a/python_modules/ewconfig/trello/boards.py b/python_modules/ewconfig/trello/boards.py new file mode 100644 index 0000000..1c991fd --- /dev/null +++ b/python_modules/ewconfig/trello/boards.py @@ -0,0 +1,20 @@ +from dataclasses import dataclass +from typing import Dict + + +@dataclass +class TrelloBoardInfo: + id: str + lists: Dict[str, str] + tags: Dict[str, str] + + +PERSONAL_TASKS_BOARD = TrelloBoardInfo( + id="tw3Cn3L6", + lists={"To Do": "6348a3ce5208f505b61d29bf"}, + tags={ + "GURU": "64e03ac77d27032282436d28", + "Github: Issue": "64eb5d72fb694cd8f0ba7a8d", + "Github: Pull Request": "652d4b775f5c59a8e6308216", + }, +) diff --git a/python_modules/ewconfig/trello/cards.py b/python_modules/ewconfig/trello/cards.py new file mode 100644 index 0000000..d51e303 --- /dev/null +++ b/python_modules/ewconfig/trello/cards.py @@ -0,0 +1,80 @@ +import requests +import logging +from typing import Any, Dict, List, Optional + +logger = logging.getLogger(__name__) + + +def get_all_trello_cards( + board_id: str, api_key: str, api_token: str +) -> List[Dict[str, Any]]: + # Get a list of cards on the board + logger.debug(f"Getting all cards on board: {board_id}") + response = requests.get( + f"https://api.trello.com/1/boards/{board_id}/cards", + params={ + "key": api_key, + "token": api_token, + }, + ) + response.raise_for_status() + cards = response.json() + logger.debug(f"Found {len(cards)} cards on board: {board_id}") + return cards + + +def create_card( + list_id: str, + name: str, + api_key: str, + api_token: str, + description: Optional[str] = None, + label_ids: Optional[List[str]] = None, + position: str = "top", +) -> str: + logger.debug(f"Creating card: {name}") + + # Build out params + params = { + "idList": list_id, + "name": name, + "key": api_key, + "token": api_token, + "pos": position, + } + if description: + params["desc"] = description + if label_ids: + params["idLabels"] = ",".join(label_ids) + + # Make a new card + response = requests.post( + "https://api.trello.com/1/cards", + params=params, + ) + response.raise_for_status() + + # Get the new card's id + card_id = response.json()["id"] + + logger.debug(f"Created card: {card_id}") + return card_id + + +def add_attachment( + card_id: str, api_key: str, api_token: str, url: Optional[str] = None +) -> None: + logger.debug(f"Adding attachment to card: {card_id}") + params = { + "key": api_key, + "token": api_token, + } + if url: + params["url"] = url + + response = requests.post( + f"https://api.trello.com/1/cards/{card_id}/attachments", + params=params, + ) + response.raise_for_status() + logger.debug(f"Added attachment to card: {card_id}")