Update fragment title in script with event timestamp (#93)

Author: lucian-ioan

tools/CHANGELOG.next.asciidoc

@@ -19,6 +19,7 @@
 - Allow the / char in variable names in eql and transpiler. {issue}715[715] {pull}718[718]
 - Fix data duplication for standalone agent on Kubernetes using the default manifest {issue-beats}31512[31512] {pull}742[742]
 - Agent updates will clean up unneeded artifacts. {issue}693[693] {issue}694[694] {pull}752[752]
+- Partial extracted beat result in failure to spawn beat {issue-beats}[21718]
 
 ==== New features
 
@@ -30,3 +31,5 @@
 - Changed the default policy selection logic. When the agent has no policy id or name defined, it will fall back to defaults (defined by $FLEET_SERVER_POLICY_ID and $FLEET_DEFAULT_TOKEN_POLICY_NAME environment variables respectively). {issue-beats}[29774] {pull}226[226]
 - Support scheduled actions and cancellation of pending actions. {issue}393[393] {pull}419[419]
 - Bump node.js version for heartbeat/synthetics to 16.15.0
+- Test PR still open {pull}247[247]
+- Test PR does not exist {pull}100000[100000]

tools/asciidoc_to_fragments.py

@@ -2,12 +2,16 @@
 # or more contributor license agreements. Licensed under the Elastic License 2.0;
 # you may not use this file except in compliance with the Elastic License 2.0.
 
-import time
 import argparse
+import requests
+
 from os import makedirs
+from os.path import expanduser
+from datetime import datetime
 
 
-timestamp = round(time.time())
+api_url = "https://api.github.com/repos/"
+github_token_location = "/.elastic/github.token"
 
 fragments_path = "changelog/fragments/"
 fragments_counter = 0
@@ -26,10 +30,12 @@
 kind_token = "===="
 field_token = "-"
 
+def write_fragment(title, fragment_timestamp, fragment_dict):
+    if not fragment_timestamp:
+        fragment_timestamp = str(1000000000 + fragments_counter)
 
-def write_fragment(title, fragment_dict):
     path = "".join([fragments_path,
-                    str(timestamp + fragments_counter),
+                    fragment_timestamp,
                     "-",
                     title,
                     ".yaml"])
@@ -38,13 +44,33 @@ def write_fragment(title, fragment_dict):
         for k, v in fragment_dict.items():
             f.write(f"{k}: {v}\n")
 
+def get_event_timestamp(repository, event, number):
+    token_path = ''.join([expanduser("~"), github_token_location])
+    with open(token_path, 'r') as f:
+        token = f.read().rstrip()
+
+    owner, repo = repository.split("/")[-2:]
+    event_url = f"{owner}/{repo}/{event}/{number}"
+    url = f"{api_url}{event_url}"
+    headers = {"Accept": "application/vnd.github+json", "Authorization": f"Bearer {token}"}
+    response = requests.get(url, headers=headers)
+    data = response.json()
+
+    if response.status_code == 404:
+        return "not_found"
+    elif data["closed_at"] is None:
+        return "event_open"
+    else:
+        date = datetime.fromisoformat(data["closed_at"].replace('Z', '+00:00'))
+        return str(int(datetime.timestamp(date)))
+
 def parse_line(line, kind):
     global fragments_counter
     fragments_counter += 1
 
     summary, *entries = line.split(" {")
     if len(entries) == 0:
-        print(f"Warning: {line} has no PR/issue fields!\n")
+        print(f"Warning: {line} -> no PR/issue fields\n")
 
     fragment_dict = {"kind": kind}
     fragment_dict["summary"] = summary.lstrip(field_token).strip()
@@ -55,7 +81,7 @@ def parse_line(line, kind):
     title = title.replace("/", "|")
     title = title.rstrip(".")
 
-    pr_repo, issue_repo = "", ""
+    pr_repo, issue_repo, fragment_timestamp = "", "", ""
 
     for entry in entries:
         number = entry[entry.find("[")+1:entry.find("]")]
@@ -68,31 +94,39 @@ def parse_line(line, kind):
         except ValueError:
             fragment_field, repo_link = entry_data, default_repolink
 
-        fragment_field = fragment_field.replace("pull", "pr")
-
         if fragment_field in fragment_dict.keys():
-            print(f"Skipping {line} -> multiple PRs/issues found!\n")
+            print(f"Skipping {line} -> multiple PRs/issues found\n")
             return
 
-        if fragment_field == "pr":
-            fragment_dict[fragment_field] = number
-            pr_repo = repo_link
+        if fragment_field == "pull":
+            fragment_dict["pr"] = ''.join([repo_link, '/pull/', number])
+            pr_number, pr_repo = number, repo_link
         elif fragment_field == "issue":
-            fragment_dict[fragment_field] = number
-            issue_repo = repo_link
-
+            fragment_dict["issue"] = ''.join([repo_link, '/issue/', number])
+            issue_number, issue_repo = number, repo_link
+    
     if pr_repo:
         fragment_dict["repository"] = pr_repo
+        fragment_timestamp = get_event_timestamp(pr_repo, "pulls", pr_number)
     elif issue_repo:
         fragment_dict["repository"] = issue_repo
+        fragment_timestamp = get_event_timestamp(issue_repo, "issues", issue_number)
+
+    if fragment_timestamp == "not_found":
+        print(f"Skipping {line} -> no response from Github API\n")
+        return
+    if fragment_timestamp == "event_open":
+        print(f"Skipping {line} -> PR/issue still open!\n")
+        return
 
     if issue_repo != pr_repo and pr_repo:
         try:
             del fragment_dict["issue"]
+            print(f"Warning: {line} -> issue info lost due to multiple repositories\n")
         except KeyError:
             pass
-   
-    write_fragment(title, fragment_dict)
+
+    write_fragment(title, fragment_timestamp, fragment_dict)
 
 def iterate_lines(f, kind='', skip=True):
     line = next(f, None)
@@ -132,6 +166,6 @@ def iterate_lines(f, kind='', skip=True):
     except FileExistsError as e:
         pass
 
-    print("Skipped entries should be manually created")
+    print("Skipped entries should be manually created and warnings should be checked")
     with open(args.path, 'r') as f:
         iterate_lines(f)

tools/requirements.txt

@@ -0,0 +1 @@
+requests==2.28.1