pick zhook.py from upstream debug branch

Author: qrkourier

zhook.py

@@ -17,7 +17,6 @@ class MattermostWebhookBody:
   issueThumbnail = "https://github.com/openziti/branding/blob/main/images/ziggy/closeups/Ziggy-has-an-Idea-Closeup.png?raw=true"
   # releaseThumbnail = "https://github.com/openziti/branding/blob/main/images/ziggy/png/Ziggy-Cash-Money-Closeup.png?raw=true"
   releaseThumbnail = "https://github.com/openziti/branding/blob/main/images/ziggy/closeups/Ziggy-Parties-Closeup.png?raw=true"
-  fipsReleaseThumbnail = "https://github.com/openziti/branding/blob/main/images/ziggy/closeups/Ziggy-The-Cop-Closeup.png?raw=true"
   watchThumbnail = "https://github.com/openziti/branding/blob/main/images/ziggy/closeups/Ziggy-is-Star-Struck.png?raw=true"
 
   prColor = "#32CD32"
@@ -73,14 +72,6 @@ def __init__(self, username, icon, eventName, eventJson, actionRepo):
       self.addForkDetails()
     elif eventName == "release":
       self.addReleaseDetails()
-    elif eventName == "repository_dispatch":
-      event_type = self.eventJson.get("action", None)
-      if event_type == "ziti_release":
-        self.addFipsPreReleaseDetails()
-      elif event_type == "ziti_promote_stable":
-        self.addFipsPromoteStableDetails()
-      else:
-        self.addRepositoryDispatchGenericDetails()  # fallback
     elif eventName == "watch":
       self.addWatchDetails()
     else:
@@ -285,42 +276,6 @@ def addReleaseDetails(self):
 
     self.attachment["text"] = bodyText
 
-  def addFipsPreReleaseDetails(self):
-    # Pre-release announcement (ziti_release)
-    payload = self.eventJson.get("client_payload", {})
-    version = payload.get("version")
-    if not version:
-        self.attachment["text"] = "[ziti-fips] Pre-release published, but version not found in event."
-        return
-    repo = self.repoJson["full_name"]
-    release_url = f"https://github.com/{repo}/releases/tag/v{version}"
-    self.body["text"] = f"FIPS Pre-release published in [{repo}](https://github.com/{repo})"
-    self.attachment["color"] = self.releaseColor
-    self.attachment["thumb_url"] = self.fipsReleaseThumbnail
-    self.attachment["text"] = f"FIPS Pre-release [{version}]({release_url}) is now available."
-
-  def addFipsPromoteStableDetails(self):
-    # Promotion to stable announcement (ziti_promote_stable)
-    payload = self.eventJson.get("client_payload", {})
-    version = payload.get("version")
-    if not version:
-        self.attachment["text"] = "[ziti-fips] Stable promotion, but version not found in event."
-        return
-    repo = self.repoJson["full_name"]
-    release_url = f"https://github.com/{repo}/releases/tag/v{version}"
-    self.body["text"] = f"FIPS Release promoted to stable in [{repo}](https://github.com/{repo})"
-    self.attachment["color"] = self.releaseColor
-    self.attachment["thumb_url"] = self.fipsReleaseThumbnail
-    self.attachment["text"] = f"FIPS Release [{version}]({release_url}) has been promoted to stable."
-
-  def addRepositoryDispatchGenericDetails(self):
-    event_type = self.eventJson.get("action", None)
-    payload = self.eventJson.get("client_payload", {})
-    repo = self.repoJson["full_name"]
-    self.body["text"] = f"Repository dispatch event received by [{repo}](https://github.com/{repo})"
-    self.attachment["color"] = self.releaseColor
-    self.attachment["text"] = f"Repository dispatch event type: `{event_type}`\nPayload: ```json\n{json.dumps(payload, indent=2)}\n```"
-
   def addWatchDetails(self):
     self.body["text"] = f"{self.createTitle()} #stargazer"
     login = self.sender["login"]
@@ -446,36 +401,6 @@ def _safe_hint(s):
   return f"len={hint_len}, startswith='{head}...'"
 
 
-def generate_json_schema(obj, max_depth=10, current_depth=0):
-  """Generate a schema representation of a JSON object by inferring types from values."""
-  if current_depth >= max_depth:
-    return "<max_depth_reached>"
-
-  if obj is None:
-    return "null"
-  elif isinstance(obj, bool):
-    return "boolean"
-  elif isinstance(obj, int):
-    return "integer"
-  elif isinstance(obj, float):
-    return "number"
-  elif isinstance(obj, str):
-    return "string"
-  elif isinstance(obj, list):
-    if len(obj) == 0:
-      return "array[]"
-    # Get schema of first element as representative
-    element_schema = generate_json_schema(obj[0], max_depth, current_depth + 1)
-    return f"array[{element_schema}]"
-  elif isinstance(obj, dict):
-    schema = {}
-    for key, value in obj.items():
-      schema[key] = generate_json_schema(value, max_depth, current_depth + 1)
-    return schema
-  else:
-    return "unknown"
-
-
 def generate_test_event(event_type):
   """Generate a test GitHub event JSON for the specified event type."""
   base_repo = {
@@ -710,43 +635,6 @@ def doPost(url, payload):
       print("ERROR: no Ziti identity provided, set INPUT_ZITIID (inline JSON or base64-encoded), or INPUT_ZITIJWT")
       exit(1)
 
-  def generate_json_schema(obj, max_depth=10, current_depth=0):
-    """Generate a schema representation of a JSON object by inferring types from values."""
-    if current_depth >= max_depth:
-      return "<max_depth_reached>"
-
-    if obj is None:
-      return "null"
-    elif isinstance(obj, bool):
-      return "boolean"
-    elif isinstance(obj, int):
-      return "integer"
-    elif isinstance(obj, float):
-      return "number"
-    elif isinstance(obj, str):
-      return "string"
-    elif isinstance(obj, list):
-      if len(obj) == 0:
-        return "array[]"
-      # Get schema of first element as representative
-      element_schema = generate_json_schema(obj[0], max_depth, current_depth + 1)
-      return f"array[{element_schema}]"
-    elif isinstance(obj, dict):
-      schema = {}
-      for key, value in obj.items():
-        schema[key] = generate_json_schema(value, max_depth, current_depth + 1)
-      return schema
-    else:
-      return f"unknown_type({type(obj).__name__})"
-
-  # Validate zitiId as JSON
-  try:
-    zitiIdJson = json.loads(zitiId)
-  except Exception as e:
-    print(f"ERROR: zitiId is not valid JSON: {e}")
-    print(f"zitiId content: {zitiId}")
-    exit(1)
-
   idFilename = "id.json"
   with open(idFilename, 'w') as f:
     f.write(zitiIdJson)
@@ -776,7 +664,7 @@ def generate_json_schema(obj, max_depth=10, current_depth=0):
 
   # Load the identity for Ziti operations
   try:
-    openziti.load(idFilename)
+    openziti.load(zitiIdJson)
   except Exception as e:
     print(f"ERROR: Failed to load Ziti identity: {e}")
     print(f"DEBUG: INPUT_ZITIID hint: {_safe_hint(os.getenv('INPUT_ZITIID'))}")