fix: ensure that tool can support Composer 3 version image names (#13546)

iennae · gemini-code-assist[bot] · web-flow · commit c71ebf54b84e · 2025-08-22T09:51:12.000+10:00
* fix: ensure that tool can support Composer 3 version image names this refactors the regular expression as per https://cloud.google.com/composer/docs/composer-versions#images Cloud Composer 3 images look like composer-3-airflow-2.10.5-build.11 versus earlier versions composer-2.8.3-airflow-2.6.3 composer-1.16.16-airflow-1.10.12 so this ensures that if Composer is a major or full version it can be parsed. Airflow version is still fully specified * chore: refactor regular expression for simplicity Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
diff --git a/composer/tools/composer_dags.py b/composer/tools/composer_dags.py
@@ -33,7 +33,7 @@ class DAG:
     """Provides necessary utils for Composer DAGs."""
 
     COMPOSER_AF_VERSION_RE = re.compile(
-        "composer-([0-9]+).([0-9]+).([0-9]+).*" "-airflow-([0-9]+).([0-9]+).([0-9]+).*"
+        "composer-(\d+)(?:\.(\d+)\.(\d+))?.*?-airflow-(\d+)\.(\d+)\.(\d+)"
     )
 
     @staticmethod

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class DAG:`
`33`	`33`	`"""Provides necessary utils for Composer DAGs."""`
`34`	`34`
`35`	`35`	`COMPOSER_AF_VERSION_RE = re.compile(`
`36`		`- "composer-([0-9]+).([0-9]+).([0-9]+)." "-airflow-([0-9]+).([0-9]+).([0-9]+)."`
	`36`	`+ "composer-(\d+)(?:\.(\d+)\.(\d+))?.*?-airflow-(\d+)\.(\d+)\.(\d+)"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`@staticmethod`