Refactor secretmanager tests for global samples

Author: archana-9430

secretmanager/snippets/create_secret_with_delayed_destroy.py

@@ -17,11 +17,14 @@
 delayed_destroy.
 """
 
+# [START secretmanager_create_secret_with_delayed_destroy]
 import argparse
 
+# Import the Secret Manager client library.
 from google.cloud import secretmanager
 
-# [START secretmanager_create_secret_with_delayed_destroy]
+# from datetime import timedelta
+from google.protobuf.duration_pb2 import Duration
 
 
 def create_secret_with_delayed_destroy(
@@ -35,12 +38,6 @@ def create_secret_with_delayed_destroy(
     Secret versions hold the actual secret material.
     """
 
-    # Import the Secret Manager client library.
-    from google.cloud import secretmanager
-
-    # Import the Duration protobuf library.
-    from google.protobuf.duration_pb2 import Duration
-
     # Create the Secret Manager client.
     client = secretmanager.SecretManagerServiceClient()
 

secretmanager/snippets/disable_secret_with_delayed_destroy.py

@@ -17,9 +17,8 @@
 
 from google.cloud import secretmanager
 
-# [START secretmanager_disable_secret_with_delayed_destroy]
-
 
+# [START secretmanager_disable_secret_with_delayed_destroy]
 def disable_secret_with_delayed_destroy(
     project_id: str, secret_id: str
 ) -> secretmanager.Secret:
@@ -36,7 +35,7 @@ def disable_secret_with_delayed_destroy(
     # Build the resource name of the secret.
     name = client.secret_path(project_id, secret_id)
 
-    # Disable delayed destroy of the secret.
+    # Delayed destroy of the secret version.
     secret = {"name": name}
     update_mask = {"paths": ["version_destroy_ttl"]}
     response = client.update_secret(request={"secret": secret, "update_mask": update_mask})

secretmanager/snippets/snippets_test.py

@@ -170,7 +170,7 @@ def secret(
     annotation_value: str,
     ttl: Optional[str],
 ) -> Iterator[Tuple[str, str, str, str]]:
-    print(f"creating secret with given secret id.")
+    print(f"creating secret {secret_id}")
 
     parent = f"projects/{project_id}"
     time.sleep(5)
@@ -199,7 +199,7 @@ def secret_with_delayed_destroy(
     version_destroy_ttl: int,
     ttl: Optional[str],
 ) -> Iterator[Tuple[str, str]]:
-    print(f"creating secret {secret_id}")
+    print("creating secret with given secret id.")
 
     parent = f"projects/{project_id}"
     time.sleep(5)
@@ -328,9 +328,7 @@ def test_create_secret_with_annotations(
 
 def test_create_secret_with_delayed_destroy(
     client: secretmanager.SecretManagerServiceClient,
-    project_id: str,
-    secret_id: str,
-    version_destroy_ttl: int,
+    project_id: str, secret_id: str, version_destroy_ttl: int
 ) -> None:
     secret = create_secret_with_delayed_destroy(project_id, secret_id, version_destroy_ttl)
     assert secret_id in secret.name

secretmanager/snippets/update_secret_with_delayed_destroy.py

@@ -17,22 +17,18 @@
 
 from google.cloud import secretmanager
 
-# [START secretmanager_update_secret_with_delayed_destroy]
+# from datetime import timedelta
+from google.protobuf.duration_pb2 import Duration
 
 
+# [START secretmanager_update_secret_with_delayed_destroy]
 def update_secret_with_delayed_destroy(
     project_id: str, secret_id: str, new_version_destroy_ttl: int
 ) -> secretmanager.UpdateSecretRequest:
     """
     Update the version destroy ttl value on an existing secret.
     """
 
-    # Import the Secret Manager client library.
-    from google.cloud import secretmanager
-
-    # from datetime import timedelta
-    from google.protobuf.duration_pb2 import Duration
-
     # Create the Secret Manager client.
     client = secretmanager.SecretManagerServiceClient()