import order

Author: damccorm

sdks/python/apache_beam/transforms/util.py

@@ -364,10 +364,10 @@ def parse_secret_option(secret) -> 'Secret':
     secret_class = Secret
     secret_params = None
     if secret_type == 'gcpsecret':
-      secret_class = GcpSecret # type: ignore[assignment]
+      secret_class = GcpSecret  # type: ignore[assignment]
       secret_params = ['version_name']
     elif secret_type == 'gcphsmgeneratedsecret':
-      secret_class = GcpHsmGeneratedSecret # type: ignore[assignment]
+      secret_class = GcpHsmGeneratedSecret  # type: ignore[assignment]
       secret_params = [
           'project_id', 'location_id', 'key_ring_id', 'key_id', 'job_name'
       ]
@@ -456,8 +456,8 @@ def get_secret_bytes(self) -> bytes:
       The secret as a byte string.
     """
     try:
-      from google.cloud import secretmanager
       from google.api_core import exceptions as api_exceptions
+      from google.cloud import secretmanager
       client = secretmanager.SecretManagerServiceClient()
 
       project_path = f"projects/{self._project_id}"
@@ -533,8 +533,9 @@ def generate_dek(self, dek_size: int = 32) -> bytes:
     try:
       import base64
       import os
-      from cryptography.hazmat.primitives.kdf.hkdf import HKDF
+
       from cryptography.hazmat.primitives import hashes
+      from cryptography.hazmat.primitives.kdf.hkdf import HKDF
       from google.cloud import kms
 
       # 1. Generate a random nonce (nonce_one)

sdks/python/apache_beam/transforms/util_test.py

@@ -72,8 +72,8 @@
 from apache_beam.transforms.core import FlatMapTuple
 from apache_beam.transforms.trigger import AfterCount
 from apache_beam.transforms.trigger import Repeatedly
-from apache_beam.transforms.util import GcpSecret
 from apache_beam.transforms.util import GcpHsmGeneratedSecret
+from apache_beam.transforms.util import GcpSecret
 from apache_beam.transforms.util import Secret
 from apache_beam.transforms.window import FixedWindows
 from apache_beam.transforms.window import GlobalWindow