From f56d30fb806c4d0d73555dbc0af8f4147be88608 Mon Sep 17 00:00:00 2001
From: Leah Cole <coleleah@google.com>
Date: Thu, 5 Dec 2024 13:51:38 -0500
Subject: [PATCH] run black

---
 .../src/cloudcomposerdiff/__main__.py          |  8 ++++++--
 .../src/cloudcomposerdiff/lib/comparator.py    | 18 +++++++++---------
 .../tests/test_diff_airflow_config.py          |  1 +
 cloudcomposerdiff/tests/test_diff_env_image.py |  1 +
 .../tests/test_diff_env_variables.py           |  1 +
 .../tests/test_diff_pypi_packages.py           |  1 +
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/cloudcomposerdiff/src/cloudcomposerdiff/__main__.py b/cloudcomposerdiff/src/cloudcomposerdiff/__main__.py
index 60cbf94..395f5b5 100644
--- a/cloudcomposerdiff/src/cloudcomposerdiff/__main__.py
+++ b/cloudcomposerdiff/src/cloudcomposerdiff/__main__.py
@@ -78,12 +78,16 @@ def main(
 ) -> None:
     """The cloudcomposerdiff tool for comparing Cloud Composer environments."""
 
-    env1: service_v1.types.Environment = service_v1.EnvironmentsClient().get_environment(
+    env1: (
+        service_v1.types.Environment
+    ) = service_v1.EnvironmentsClient().get_environment(
         request=service_v1.GetEnvironmentRequest(
             name=f"projects/{env1_project_id}/locations/{env1_location}/environments/{env1_name}"
         )
     )
-    env2: service_v1.types.Environment = service_v1.EnvironmentsClient().get_environment(
+    env2: (
+        service_v1.types.Environment
+    ) = service_v1.EnvironmentsClient().get_environment(
         request=service_v1.GetEnvironmentRequest(
             name=f"projects/{env2_project_id}/locations/{env2_location}/environments/{env2_name}"
         )
diff --git a/cloudcomposerdiff/src/cloudcomposerdiff/lib/comparator.py b/cloudcomposerdiff/src/cloudcomposerdiff/lib/comparator.py
index 6facef4..9ec93b7 100644
--- a/cloudcomposerdiff/src/cloudcomposerdiff/lib/comparator.py
+++ b/cloudcomposerdiff/src/cloudcomposerdiff/lib/comparator.py
@@ -68,15 +68,15 @@ def output_diffs_as_json(self: T) -> None:
                     {
                         "category": diff.category_of_diff,
                         "attribute": diff.diff_anchor,
-                        "env_1_value": None
-                        if diff.values_match
-                        else diff.env_1_anchor_value,
-                        "env_2_value": None
-                        if diff.values_match
-                        else diff.env_2_anchor_value,
-                        "matching_value": diff.env_1_anchor_value
-                        if diff.values_match
-                        else None,
+                        "env_1_value": (
+                            None if diff.values_match else diff.env_1_anchor_value
+                        ),
+                        "env_2_value": (
+                            None if diff.values_match else diff.env_2_anchor_value
+                        ),
+                        "matching_value": (
+                            diff.env_1_anchor_value if diff.values_match else None
+                        ),
                     }
                 )
             json.dump(json_data, write_file, indent=4)
diff --git a/cloudcomposerdiff/tests/test_diff_airflow_config.py b/cloudcomposerdiff/tests/test_diff_airflow_config.py
index 3a5ab3e..8c76734 100644
--- a/cloudcomposerdiff/tests/test_diff_airflow_config.py
+++ b/cloudcomposerdiff/tests/test_diff_airflow_config.py
@@ -13,6 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  """
+
 from typing import List
 
 from google.cloud.orchestration.airflow import service_v1
diff --git a/cloudcomposerdiff/tests/test_diff_env_image.py b/cloudcomposerdiff/tests/test_diff_env_image.py
index 228aa6e..172ce46 100644
--- a/cloudcomposerdiff/tests/test_diff_env_image.py
+++ b/cloudcomposerdiff/tests/test_diff_env_image.py
@@ -13,6 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  """
+
 from typing import List
 
 from google.cloud.orchestration.airflow import service_v1
diff --git a/cloudcomposerdiff/tests/test_diff_env_variables.py b/cloudcomposerdiff/tests/test_diff_env_variables.py
index 162dac2..03e5869 100644
--- a/cloudcomposerdiff/tests/test_diff_env_variables.py
+++ b/cloudcomposerdiff/tests/test_diff_env_variables.py
@@ -13,6 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  """
+
 from typing import List
 
 from google.cloud.orchestration.airflow import service_v1
diff --git a/cloudcomposerdiff/tests/test_diff_pypi_packages.py b/cloudcomposerdiff/tests/test_diff_pypi_packages.py
index 125600f..b95ea0a 100644
--- a/cloudcomposerdiff/tests/test_diff_pypi_packages.py
+++ b/cloudcomposerdiff/tests/test_diff_pypi_packages.py
@@ -13,6 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  """
+
 from typing import List
 
 from google.cloud.orchestration.airflow import service_v1