various: strictly type five more scripts

These were all fairly trivial.

Author: allisonkarlitskaya

github-info

@@ -18,7 +18,7 @@
 # along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 
 # Shared GitHub code. When run as a script, we print out info about
-# our GitHub interacition.
+# our GitHub interaction.
 
 import argparse
 import datetime
@@ -29,7 +29,7 @@ from task import github
 sys.dont_write_bytecode = True
 
 
-def httpdate(dt):
+def httpdate(dt: datetime.datetime) -> str:
     """Return a string representation of a date according to RFC 1123
     (HTTP/1.1).
 
@@ -45,7 +45,7 @@ def httpdate(dt):
                                                     dt.year, dt.hour, dt.minute, dt.second)
 
 
-def main():
+def main() -> int:
     parser = argparse.ArgumentParser(description='Test GitHub rate limits')
     parser.parse_args()
 

github-upload-secrets

@@ -106,7 +106,9 @@ def upload_secrets(
             api.put(f"{secrets_path}/{name}", payload)
 
 
-def upload_deploy_key(api, repo, title, content, opts):
+def upload_deploy_key(
+    api: task.github.GitHub, repo: str, title: str, content: bytes, opts: argparse.Namespace
+) -> None:
     keys_path = f"/repos/{repo.lstrip('+')}/keys"
 
     if repo.startswith('+'):
@@ -131,23 +133,23 @@ def upload_deploy_key(api, repo, title, content, opts):
         api.post(keys_path, {'title': title, 'key': content.decode('ascii')})
 
 
-def do_directory(api, repo, env, directory, opts):
+def do_directory(api: task.github.GitHub, repo: str, env: str, directory: str, opts: argparse.Namespace) -> None:
     secrets = {}
-    for entry in os.scandir(opts.directory):
+    for entry in os.scandir(directory):
         with open(entry.path, 'rb') as f:
             secrets[entry.name] = f.read().strip()
     upload_secrets(api, repo, env, secrets, opts)
 
 
-def do_deploy_key(api, deploy_to, deploy_from, opts):
+def do_deploy_key(api: task.github.GitHub, deploy_to: str, deploy_from: str, opts: argparse.Namespace) -> None:
     repo, env, secret = deploy_from.rsplit('/', 2)
     public, private = generate_ssh_key()
 
     upload_deploy_key(api, deploy_to, deploy_from, public, opts)
     upload_secrets(api, repo, env, {secret: private}, opts)
 
 
-def main():
+def main() -> None:
     api = task.github.GitHub()
 
     parser = argparse.ArgumentParser(description='Upload encrypted action secrets to GitHub')

inspect-queue

@@ -25,7 +25,7 @@ from task import distributed_queue
 MAX_PRIORITY = 9
 
 
-def main():
+def main() -> int:
     parser = argparse.ArgumentParser(description='Read and print messages from the queue without acknowleding them')
     parser.add_argument('--amqp', default=distributed_queue.DEFAULT_AMQP_SERVER,
                         help='The host:port of the AMQP server to consume from (default: %(default)s)')
@@ -35,7 +35,7 @@ def main():
 
     with distributed_queue.DistributedQueue(opts.amqp, ['public', 'rhel', 'statistics', 'webhook'],
                                             secrets_dir=opts.secrets_dir, passive=True) as q:
-        def print_queue(queue):
+        def print_queue(queue: str) -> None:
             if q.declare_results[queue] is None:
                 print(f"queue {queue} does not exist")
                 return

issues-review

@@ -31,7 +31,7 @@ the implementation, please comment here.
 """
 
 
-def issues_review(api, opts):
+def issues_review(api: github.GitHub, opts: argparse.Namespace) -> None:
     now = time.time()
     treshold = opts.age * 86400
     count = 100
@@ -47,7 +47,7 @@ def issues_review(api, opts):
                 api.post("issues/%i/labels" % issue["number"], [opts.label])
 
 
-def close_issues(api, opts):
+def close_issues(api: github.GitHub, opts: argparse.Namespace) -> None:
     count = 100
     page = 1
     while count == 100:
@@ -70,7 +70,7 @@ def close_issues(api, opts):
             api.post("issues/%i" % issue["number"], {"state": "closed"})
 
 
-def main():
+def main() -> None:
     parser = argparse.ArgumentParser(description='Label or close labeled stable issues')
     parser.add_argument('-a', '--age', metavar='DAYS', default=90,
                         help='Label issues whose last update is older than DAYS (default: %(default)s)')

push-rewrite

@@ -17,10 +17,11 @@ import subprocess
 import sys
 import time
 
+from lib.aio.jsonutil import JsonObject, get_dict, get_str
 from task import github, labels_of_pull
 
 
-def execute(*args):
+def execute(*args: str) -> str:
     try:
         sys.stderr.write("+ " + " ".join(args) + "\n")
         output = subprocess.check_output(args, text=True)
@@ -29,20 +30,20 @@ def execute(*args):
     return output
 
 
-def git(*args):
+def git(*args: str) -> str:
     return execute("git", *args).strip()
 
 
-def find_pr_with_sha(api, sha):
+def find_pr_with_sha(api: github.GitHub, sha: str) -> JsonObject:
     pulls = api.pulls()
     for pull in pulls:
-        if pull["head"]["sha"] == sha:
+        if get_str(get_dict(pull, "head"), "sha") == sha:
             return pull
     sys.stderr.write(f"Could not find pull with revision {sha}.\n")
     sys.exit(1)
 
 
-def main():
+def main() -> None:
     parser = argparse.ArgumentParser(description='Force push after a rewrite')
     parser.add_argument('--repo', help="The GitHub repository to work with", default=None)
     opts = parser.parse_args()
@@ -61,7 +62,7 @@ def main():
 
     pull = find_pr_with_sha(api, remote)
     labels = labels_of_pull(pull)
-    tests_disabled = "no-test" in labels or "[no-test]" in pull["title"]
+    tests_disabled = "no-test" in labels or "[no-test]" in get_str(pull, "title")
     # needs no-test label to prevent tests bring triggered
     # we cannot set the label for ourselves without `repo` permission
     if not tests_disabled:

pyproject.toml

@@ -34,16 +34,11 @@ module = [
     'test_tests_scan',
 
     'cockpit-lib-update',
-    'github-info',
-    'github-upload-secrets',
     'image-refresh',
     'image-trigger',
-    'inspect-queue',
-    'issues-review',
     'naughty-prune',
     'npm-update',
     'po-refresh',
-    'push-rewrite',
     'run-queue',
     'store-tests',
     'tasks-container-update',