Merge pull request #36978 from ClickHouse/installation-id

Fix installation_id filter, minimize docker images diff

tests/ci/cancel_and_rerun_workflow_lambda/app.py

@@ -5,6 +5,7 @@ from typing import Any, Dict, List
 from threading import Thread
 from queue import Queue
 import json
+import os
 import time
 
 import jwt
@@ -20,7 +21,7 @@ NEED_RERUN_OR_CANCELL_WORKFLOWS = {
 
 # https://docs.github.com/en/rest/reference/actions#cancel-a-workflow-run
 #
-API_URL = "https://api.github.com/repos/ClickHouse/ClickHouse"
+API_URL = os.getenv("API_URL", "https://api.github.com/repos/ClickHouse/ClickHouse")
 
 MAX_RETRY = 5
 
@@ -53,7 +54,10 @@ def get_installation_id(jwt_token):
     response = requests.get("https://api.github.com/app/installations", headers=headers)
     response.raise_for_status()
     data = response.json()
-    return data[0]["id"]
+    for installation in data:
+        if installation["account"]["login"] == "ClickHouse":
+            installation_id = installation["id"]
+    return installation_id
 
 
 def get_access_token(jwt_token, installation_id):

tests/ci/metrics_lambda/Dockerfile

@@ -1,13 +1,13 @@
 FROM public.ecr.aws/lambda/python:3.9
 
-# Copy function code
-COPY app.py ${LAMBDA_TASK_ROOT}
-
 # Install the function's dependencies using file requirements.txt
 # from your project folder.
 
 COPY requirements.txt  .
 RUN  pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
 
+# Copy function code
+COPY app.py ${LAMBDA_TASK_ROOT}
+
 # Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
 CMD [ "app.handler" ]

tests/ci/metrics_lambda/app.py

@@ -100,7 +100,10 @@ def get_installation_id(jwt_token):
     response = requests.get("https://api.github.com/app/installations", headers=headers)
     response.raise_for_status()
     data = response.json()
-    return data[0]["id"]
+    for installation in data:
+        if installation["account"]["login"] == "ClickHouse":
+            installation_id = installation["id"]
+    return installation_id
 
 
 def get_access_token(jwt_token, installation_id):

tests/ci/termination_lambda/Dockerfile

@@ -1,13 +1,13 @@
 FROM public.ecr.aws/lambda/python:3.9
 
-# Copy function code
-COPY app.py ${LAMBDA_TASK_ROOT}
-
 # Install the function's dependencies using file requirements.txt
 # from your project folder.
 
 COPY requirements.txt  .
 RUN  pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
 
+# Copy function code
+COPY app.py ${LAMBDA_TASK_ROOT}
+
 # Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
 CMD [ "app.handler" ]

tests/ci/termination_lambda/app.py

@@ -30,7 +30,10 @@ def get_installation_id(jwt_token):
     response = requests.get("https://api.github.com/app/installations", headers=headers)
     response.raise_for_status()
     data = response.json()
-    return data[0]["id"]
+    for installation in data:
+        if installation["account"]["login"] == "ClickHouse":
+            installation_id = installation["id"]
+    return installation_id
 
 
 def get_access_token(jwt_token, installation_id):

tests/ci/token_lambda/Dockerfile

@@ -1,13 +1,13 @@
 FROM public.ecr.aws/lambda/python:3.9
 
-# Copy function code
-COPY app.py ${LAMBDA_TASK_ROOT}
-
 # Install the function's dependencies using file requirements.txt
 # from your project folder.
 
 COPY requirements.txt  .
 RUN  pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
 
+# Copy function code
+COPY app.py ${LAMBDA_TASK_ROOT}
+
 # Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
 CMD [ "app.handler" ]

tests/ci/token_lambda/app.py

@@ -16,7 +16,10 @@ def get_installation_id(jwt_token):
     response = requests.get("https://api.github.com/app/installations", headers=headers)
     response.raise_for_status()
     data = response.json()
-    return data[0]["id"]
+    for installation in data:
+        if installation["account"]["login"] == "ClickHouse":
+            installation_id = installation["id"]
+    return installation_id
 
 
 def get_access_token(jwt_token, installation_id):

tests/ci/workflow_approve_rerun_lambda/app.py

@@ -1,15 +1,16 @@
 #!/usr/bin/env python3
 
-import json
-import time
-import fnmatch
 from collections import namedtuple
-import jwt
+import fnmatch
+import json
+import os
+import time
 
+import jwt
 import requests  # type: ignore
 import boto3  # type: ignore
 
-API_URL = "https://api.github.com/repos/ClickHouse/ClickHouse"
+API_URL = os.getenv("API_URL", "https://api.github.com/repos/ClickHouse/ClickHouse")
 
 SUSPICIOUS_CHANGED_FILES_NUMBER = 200
 
@@ -139,7 +140,10 @@ def get_installation_id(jwt_token):
     response = requests.get("https://api.github.com/app/installations", headers=headers)
     response.raise_for_status()
     data = response.json()
-    return data[0]["id"]
+    for installation in data:
+        if installation["account"]["login"] == "ClickHouse":
+            installation_id = installation["id"]
+    return installation_id
 
 
 def get_access_token(jwt_token, installation_id):