Skip to content

Commit 9423409

Browse files
authored
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
1 parent 467a34a commit 9423409

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer/tools/composer_dags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DAG:
3333
"""Provides necessary utils for Composer DAGs."""
3434

3535
COMPOSER_AF_VERSION_RE = re.compile(
36-
"composer-([0-9]+).([0-9]+).([0-9]+).*" "-airflow-([0-9]+).([0-9]+).([0-9]+).*"
36+
"composer-([0-9]+)(?:.([0-9]+).([0-9]+))?.*-airflow-([0-9]+).([0-9]+).([0-9]+)"
3737
)
3838

3939
@staticmethod

0 commit comments

Comments
 (0)