Fix unwanted artifact deletion with checking remote_downloads field (#…

…157)
devopshq · Jan 13, 2025 · e1b74fa · e1b74fa
1 parent fce5b54
commit e1b74fa
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 3 deletions.
diff --git a/artifactory_cleanup/rules/delete.py b/artifactory_cleanup/rules/delete.py
@@ -31,7 +31,12 @@ class DeleteWithoutDownloads(Rule):
     """
 
     def aql_add_filter(self, filters):
-        filter_ = {"stat.downloads": {"$eq": None}}
+        filter_ = {
+            "$and": [
+                {"stat.downloads": {"$eq": None}},
+                {"stat.remote_downloads":{"$eq": None}},
+            ],
+        }
         filters.append(filter_)
         return filters
 
@@ -49,6 +54,7 @@ def aql_add_filter(self, filters):
         filter_ = {
             "$and": [
                 {"stat.downloads": {"$eq": None}},
+                {"stat.remote_downloads":{"$eq": None}},
                 {"created": {"$lte": last_day.isoformat()}},
             ],
         }
@@ -70,10 +76,28 @@ def aql_add_filter(self, filters):
 
         filter_ = {
             "$or": [
-                {"stat.downloaded": {"$lte": str(last_day)}},
+                {
+                    "$and": [
+                        {"stat.downloaded": {"$lte": str(last_day)}},
+                        {"stat.remote_downloaded": {"$lte": str(last_day)}},
+                    ]
+                },
+                {
+                    "$and": [
+                        {"stat.downloaded": {"$lte": str(last_day)}},
+                        {"stat.remote_downloads": {"$eq": None}},
+                    ]
+                },
+                {
+                    "$and": [
+                        {"stat.downloads": {"$eq": None}},
+                        {"stat.remote_downloaded": {"$lte": str(last_day)}},
+                    ]
+                },
                 {
                     "$and": [
                         {"stat.downloads": {"$eq": None}},
+                        {"stat.remote_downloads": {"$eq": None}},
                         {"created": {"$lte": str(last_day)}},
                     ]
                 },

diff --git a/artifactory_cleanup/rules/docker.py b/artifactory_cleanup/rules/docker.py
@@ -114,6 +114,7 @@ def aql_add_filter(self, filters):
         last_day = self.today - self.days
         filter_ = [
             {"stat.downloads": {"$eq": None}},
+            {"stat.remote_downloads": {"$eq": None}},
             {"created": {"$lte": last_day.isoformat()}},
         ]
         filters.extend(filter_)
@@ -131,10 +132,28 @@ def aql_add_filter(self, filters):
         print("Delete docker images not used from {}".format(last_day.isoformat()))
         filter_ = {
             "$or": [
-                {"stat.downloaded": {"$lte": last_day.isoformat()}},
+                {
+                    "$and": [
+                        {"stat.downloaded": {"$lte": last_day.isoformat()}},
+                        {"stat.remote_downloaded": {"$lte": last_day.isoformat()}},
+                    ]
+                },
+                {
+                    "$and": [
+                        {"stat.downloaded": {"$lte": last_day.isoformat()}},
+                        {"stat.remote_downloads": {"$eq": None}},
+                    ]
+                },
+                {
+                    "$and": [
+                        {"stat.downloads": {"$eq": None}},
+                        {"stat.remote_downloaded": {"$lte": last_day.isoformat()}},
+                    ]
+                },
                 {
                     "$and": [
                         {"stat.downloads": {"$eq": None}},
+                        {"stat.remote_downloads": {"$eq": None}},
                         {"created": {"$lte": last_day.isoformat()}},
                     ]
                 },