feat: check if iamge has been pushed in the last 7 days

Author: knechtionscoding

.github/workflows/docker-build-publish.yaml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@40891eba8c2bcd1309b07ba8b11232f313e86779
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -34,7 +34,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@eafaea8d0f5853934deece2ffa67af59d936562b
+        uses: docker/build-push-action@817ed59f97d2974e2c1d92f170242f52fd3feae4
         with:
           context: .
           push: true

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "python.formatting.provider": "black"
+    "python.formatting.provider": "none",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    }
 }

Makefile

@@ -11,6 +11,9 @@ test: lint
 run:
 	poetry run ./main.py
 
+push: test
+	git push
+
 dry-run:
 	DRY_RUN=true poetry run ./main.py
 

main.py

@@ -195,6 +195,31 @@ def get_ecr_images(
     return images
 
 
+def is_image_pushed_recently(image: dict) -> bool:
+    """
+    :param image dict: image details
+    Checks to see if the image has been pushed in the last 7 days
+    :return bool: if the image has been pushed in the last 7 days True will be returned
+    """
+    logging.debug("Checking if the image has been pushed recently")
+    logger.debug(f"{image=}")
+    if "imagePushedAt" in image:
+        last_pull_time = image["imagePushedAt"]
+        localized_now_ts = UTC.localize(datetime.now() - timedelta(7))
+        logger.debug(last_pull_time)
+        logger.debug(localized_now_ts)
+        if last_pull_time > localized_now_ts:
+            logger.debug("The last pulltime was more than 7 days ago")
+            return True
+        else:
+            return False
+    else:
+        logger.info(
+            f"There is no imagePushedAt because the {image['image_uri']} has something terribly wrong with it"
+        )
+        return False
+
+
 def is_image_pulled_recently(image: dict) -> bool:
     """
     :param image dict: image details
@@ -283,7 +308,8 @@ def is_image_deletable(image: dict, k8s_images: list) -> bool:
     # TODO: Make it handle multiple tags
 
     if (
-        is_image_referenced(image, k8s_images)
+        is_image_pushed_recently(image)
+        or is_image_referenced(image, k8s_images)
         or is_image_pulled_recently(image)
         or is_image_tagged_keep(image)
     ):

poetry.lock

@@ -145,6 +145,31 @@ def test_is_image_pulled_recently(image, result):
     assert (main.is_image_pulled_recently(image)) == result
 
 
+@pytest.mark.parametrize(
+    "image,result",
+    [
+        (
+            {
+                "imagePushedAt": UTC.localize(datetime.now() - timedelta(2)),
+            },
+            True,
+        ),
+        (
+            {
+                "imagePushedAt": UTC.localize(datetime.now() - timedelta(10)),
+            },
+            False,
+        ),
+        (
+            {"image_uri": "test"},
+            False,
+        ),
+    ],
+)
+def test_is_image_pushed_recently(image, result):
+    assert (main.is_image_pushed_recently(image)) == result
+
+
 @pytest.mark.parametrize(
     "image,result",
     [