Merge pull request syslog-ng#5147 from syslog-ng/nightly_cdn_to_front_door

package-indexer: use afd_endpoints instead of endpoints in CDN purge call

Author: kovgeri01

packaging/package-indexer/cdn/azure_cdn.py

@@ -46,6 +46,10 @@ class AzureCDN(CDN):
       tenant-id: "secret5"
       client-id: "secret6"
       client-secret: "secret7"
+      domains:
+        - "<domain1>"
+        - "<domain2>"
+        ...
     ```
     """
 
@@ -58,6 +62,7 @@ def __init__(
         tenant_id: str,
         client_id: str,
         client_secret: str,
+        domains: list,
     ):
         credential = ClientSecretCredential(
             tenant_id=tenant_id,
@@ -72,6 +77,7 @@ def __init__(
         self.__resource_group_name = resource_group_name
         self.__profile_name = profile_name
         self.__endpoint_name = endpoint_name
+        self.__domains = domains
 
         super().__init__()
 
@@ -89,23 +95,24 @@ def from_config(cfg: dict) -> CDN:
             tenant_id=cfg["tenant-id"],
             client_id=cfg["client-id"],
             client_secret=cfg["client-secret"],
+            domains=cfg["domains"],
         )
 
     def refresh_cache(self, path: Path) -> None:
         path_str = str(Path("/", path))
 
-        self._log_info("Refreshing CDN cache.", path=path_str)
+        self._log_info("Refreshing CDN cache.", path=path_str, domains=str(self.__domains))
 
-        poller: LROPoller = self.__cdn.endpoints.begin_purge_content(
+        poller: LROPoller = self.__cdn.afd_endpoints.begin_purge_content(
             resource_group_name=self.__resource_group_name,
             profile_name=self.__profile_name,
             endpoint_name=self.__endpoint_name,
-            content_file_paths=PurgeParameters(content_paths=[path_str]),
+            contents={"contentPaths": [path_str], "domains": self.__domains},
         )
         poller.wait()
 
         status = poller.status()
         if not status == "Succeeded":
             raise Exception("Failed to refresh CDN cache. status: {}".format(status))
 
-        self._log_info("Successfully refreshed CDN cache.", path=path_str)
+        self._log_info("Successfully refreshed CDN cache.", path=path_str, domains=str(self.__domains))

packaging/package-indexer/index-packages.py

@@ -73,6 +73,11 @@ def add_optional_arguments(parser: ArgumentParser) -> None:
         type=str,
         help="Also log more verbosely into this file.",
     )
+    parser.add_argument(
+        "--flush-cache-only",
+        action="store_true",
+        help="Only flush the caches of the Azure CDN. Used for testing that part.",
+    )
 
 
 def parse_args() -> dict:
@@ -157,8 +162,12 @@ def main() -> None:
     cfg = load_config(args)
 
     indexers = construct_indexers(cfg, args)
-    for indexer in indexers:
-        indexer.index()
+    if args["flush_cache_only"]:
+        for indexer in indexers:
+            indexer.flush_cdn_cache()
+    else:
+        for indexer in indexers:
+            indexer.index()
 
 
 if __name__ == "__main__":

packaging/package-indexer/indexer/indexer.py

@@ -86,6 +86,9 @@ def index(self) -> None:
         self.__sync_to_remote()
         self.__refresh_cdn_cache()
 
+    def flush_cdn_cache(self) -> None:
+        self.__refresh_cdn_cache()
+
     @staticmethod
     def __create_logger() -> logging.Logger:
         logger = logging.getLogger("Indexer")