Resolving issue with regex for composer environments

killkelleyr · killkelleyr · commit 9cf8624b78e5 · 2024-09-11T10:40:31.000-04:00
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+){0,2})-airflow-(\d+(?:\.\d+){0,2}).*"
     )
 
     @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+){0,2})-airflow-(\d+(?:\.\d+){0,2}).*"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`@staticmethod`