Merge pull request #68 from 4dn-dcic/dmichaels-fix-deploy-for-cgap-ms…

…a-20241126

fix for deploy for cgap-msa (et.al. similar like cgap-dbmi).

.github/workflows/main-publish.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           python-version: 3.12
       - name: Install Python dependencies for publish
-        run: python -m pip install dcicutils==8.7.0.1b2
+        run: python -m pip install dcicutils==8.16.6
       - name: Update the gitinfo.json file with latest relevant git info
         run: |
           echo "{\"repo\": \"https://github.com/${{ github.repository }}\", \"branch\": \"${GITHUB_REF##*/}\", \"commit\": \"${GITHUB_SHA}\"}" > foursight_core/gitinfo.json

CHANGELOG.rst

@@ -6,6 +6,14 @@ foursight-core
 Change Log
 ----------
 
+5.8.0
+=====
+* 2024-11-26/dmichaels
+* Fix in aws_ecs_services for deploying to cgap-msa (et.al. similar e.g. cgap-dbmi);
+  it wasn't picking up correct CodeBuild project and exceptioning out.
+* Updated dcicutils to 8.16.4 (just to keep up to date).
+
+
 5.7.0
 =====
 * 2024-10-11/dmichaels

Makefile

@@ -1,7 +1,7 @@
 .PHONY: test
 
 configure:  # does any pre-requisite installs
-	pip install poetry
+	pip install poetry==1.8.5
 	pip install setuptools wheel
 
 lint:

foursight_core/react/api/aws_ecs_services.py

@@ -343,6 +343,23 @@ def prefer_project(preferred_project: str):
         preferred_project = [project for project in projects if image_tag.lower() in project.lower()]
         if preferred_project:
             return prefer_project(preferred_project[0])
+
+        # Bit of a hack here to handle specific case of cgap-msa (and similar e.g. cgap-dbmi) where
+        # the ECR image name (e.g. "main") does not match the CodeBuild project name, e.g. like
+        # for smaht we have image name "smaht-devtest" and CodeBuild project name "smaht-devtest"
+        # for for cgap-msa we have image name "main and CodeBuild project nanme "cgap-msa", so for
+        # just to make sure we look at the "right" CodeBuild project name first we defavor any
+        # others like "cgap-msa-pipeline-builder" or ""cgap-msa-tibanna-awsf-builder". The real
+        # problem is so far have not found a good way to align info from these two data sets,
+        # i.e. the CodeBuild project names and the ECR images names. But this works for now.
+        defavored_projects = []
+        for project in projects:
+            if ("pipeline" in project.lower()) or ("tibanna" in project.lower()):
+                defavored_projects.append(project)
+        for defavored_project in defavored_projects:
+            projects.remove(defavored_project)
+            projects.append(defavored_project)
+
         return projects
 
     def get_relevant_builds(project: str) -> Generator[Optional[Dict], None, None]:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "foursight-core"
-version = "5.7.0"
+version = "5.7.0.1b7"  # TODO: To become 5.8.0
 description = "Serverless Chalice Application for Monitoring"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"
@@ -17,7 +17,7 @@ botocore = "^1.34.136"
 click = "^7.1.2"
 cron-descriptor = "^1.2.31"
 cryptography = "^43.0.1"  # Required for AWS Cognito JWT decode (PyJWKClient)
-dcicutils = "^8.16.1"
+dcicutils = "^8.16.4"
 elasticsearch = "7.13.4"
 elasticsearch-dsl = "^7.0.0"
 geocoder = "1.38.1"