From baaef83a638e7581a4fe3985c9fa07bfba7736b0 Mon Sep 17 00:00:00 2001 From: arithmetic1728 <58957152+arithmetic1728@users.noreply.github.com> Date: Tue, 15 Sep 2020 15:35:14 -0700 Subject: [PATCH] feat!: migrate to use microgen (#44) * feat!: migrate to use microgen * update * fix lint --- .../snippets/access_secret_version.py | 22 +++---- secretmanager/snippets/add_secret_version.py | 22 +++---- secretmanager/snippets/create_secret.py | 28 +++++---- secretmanager/snippets/delete_secret.py | 14 +++-- .../snippets/destroy_secret_version.py | 20 +++---- .../snippets/disable_secret_version.py | 20 +++---- .../snippets/enable_secret_version.py | 20 +++---- secretmanager/snippets/get_secret.py | 27 ++++----- secretmanager/snippets/get_secret_version.py | 22 +++---- secretmanager/snippets/iam_grant_access.py | 24 ++++---- secretmanager/snippets/iam_revoke_access.py | 22 +++---- .../snippets/list_secret_versions.py | 16 ++--- secretmanager/snippets/list_secrets.py | 16 ++--- secretmanager/snippets/quickstart.py | 30 ++++++---- secretmanager/snippets/requirements.txt | 2 +- secretmanager/snippets/snippets_test.py | 60 ++++++++++--------- secretmanager/snippets/update_secret.py | 20 ++++--- 17 files changed, 201 insertions(+), 184 deletions(-) diff --git a/secretmanager/snippets/access_secret_version.py b/secretmanager/snippets/access_secret_version.py index c620ea32f84b..a8e2837d733c 100644 --- a/secretmanager/snippets/access_secret_version.py +++ b/secretmanager/snippets/access_secret_version.py @@ -33,29 +33,29 @@ def access_secret_version(project_id, secret_id, version_id): client = secretmanager.SecretManagerServiceClient() # Build the resource name of the secret version. - name = client.secret_version_path(project_id, secret_id, version_id) + name = f"projects/{project_id}/secrets/{secret_id}/versions/{version_id}" # Access the secret version. - response = client.access_secret_version(name) + response = client.access_secret_version(request={"name": name}) # Print the secret payload. # # WARNING: Do not print the secret in a production environment - this # snippet is showing how to access the secret material. - payload = response.payload.data.decode('UTF-8') - print('Plaintext: {}'.format(payload)) -# [END secretmanager_access_secret_version] + payload = response.payload.data.decode("UTF-8") + print("Plaintext: {}".format(payload)) + # [END secretmanager_access_secret_version] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret to access') - parser.add_argument('version_id', help='version to access') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret to access") + parser.add_argument("version_id", help="version to access") args = parser.parse_args() access_secret_version(args.project_id, args.secret_id, args.version_id) diff --git a/secretmanager/snippets/add_secret_version.py b/secretmanager/snippets/add_secret_version.py index 51be8716f975..442b12ede93b 100644 --- a/secretmanager/snippets/add_secret_version.py +++ b/secretmanager/snippets/add_secret_version.py @@ -37,25 +37,27 @@ def add_secret_version(project_id, secret_id, payload): # Convert the string payload into a bytes. This step can be omitted if you # pass in bytes instead of a str for the payload argument. - payload = payload.encode('UTF-8') + payload = payload.encode("UTF-8") # Add the secret version. - response = client.add_secret_version(parent, {'data': payload}) + response = client.add_secret_version( + request={"parent": parent, "payload": {"data": payload}} + ) # Print the new secret version name. - print('Added secret version: {}'.format(response.name)) -# [END secretmanager_add_secret_version] + print("Added secret version: {}".format(response.name)) + # [END secretmanager_add_secret_version] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret in which to add') - parser.add_argument('payload', help='secret material payload') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret in which to add") + parser.add_argument("payload", help="secret material payload") args = parser.parse_args() add_secret_version(args.project_id, args.secret_id, args.payload) diff --git a/secretmanager/snippets/create_secret.py b/secretmanager/snippets/create_secret.py index 23d9347a8c1b..67a9839c3bf1 100644 --- a/secretmanager/snippets/create_secret.py +++ b/secretmanager/snippets/create_secret.py @@ -34,28 +34,30 @@ def create_secret(project_id, secret_id): client = secretmanager.SecretManagerServiceClient() # Build the resource name of the parent project. - parent = client.project_path(project_id) + parent = f"projects/{project_id}" # Create the secret. - response = client.create_secret(parent, secret_id, { - 'replication': { - 'automatic': {}, - }, - }) + response = client.create_secret( + request={ + "parent": parent, + "secret_id": secret_id, + "secret": {"replication": {"automatic": {}}}, + } + ) # Print the new secret name. - print('Created secret: {}'.format(response.name)) -# [END secretmanager_create_secret] + print("Created secret: {}".format(response.name)) + # [END secretmanager_create_secret] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret to create') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret to create") args = parser.parse_args() create_secret(args.project_id, args.secret_id) diff --git a/secretmanager/snippets/delete_secret.py b/secretmanager/snippets/delete_secret.py index 3ee5a2bb1253..ad5823628327 100644 --- a/secretmanager/snippets/delete_secret.py +++ b/secretmanager/snippets/delete_secret.py @@ -35,16 +35,18 @@ def delete_secret(project_id, secret_id): name = client.secret_path(project_id, secret_id) # Delete the secret. - client.delete_secret(name) + client.delete_secret(request={"name": name}) + + # [END secretmanager_delete_secret] -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret to delete') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret to delete") args = parser.parse_args() delete_secret(args.project_id, args.secret_id) diff --git a/secretmanager/snippets/destroy_secret_version.py b/secretmanager/snippets/destroy_secret_version.py index 1d0331811abb..3a812a039eff 100644 --- a/secretmanager/snippets/destroy_secret_version.py +++ b/secretmanager/snippets/destroy_secret_version.py @@ -33,24 +33,24 @@ def destroy_secret_version(project_id, secret_id, version_id): client = secretmanager.SecretManagerServiceClient() # Build the resource name of the secret version - name = client.secret_version_path(project_id, secret_id, version_id) + name = f"projects/{project_id}/secrets/{secret_id}/versions/{version_id}" # Destroy the secret version. - response = client.destroy_secret_version(name) + response = client.destroy_secret_version(request={"name": name}) - print('Destroyed secret version: {}'.format(response.name)) -# [END secretmanager_destroy_secret_version] + print("Destroyed secret version: {}".format(response.name)) + # [END secretmanager_destroy_secret_version] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret from which to act') - parser.add_argument('version_id', help='id of the version to destroy') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret from which to act") + parser.add_argument("version_id", help="id of the version to destroy") args = parser.parse_args() destroy_secret_version(args.project_id, args.secret_id, args.version_id) diff --git a/secretmanager/snippets/disable_secret_version.py b/secretmanager/snippets/disable_secret_version.py index a88f1a76215e..8d7a11569fef 100644 --- a/secretmanager/snippets/disable_secret_version.py +++ b/secretmanager/snippets/disable_secret_version.py @@ -33,24 +33,24 @@ def disable_secret_version(project_id, secret_id, version_id): client = secretmanager.SecretManagerServiceClient() # Build the resource name of the secret version - name = client.secret_version_path(project_id, secret_id, version_id) + name = f"projects/{project_id}/secrets/{secret_id}/versions/{version_id}" # Disable the secret version. - response = client.disable_secret_version(name) + response = client.disable_secret_version(request={"name": name}) - print('Disabled secret version: {}'.format(response.name)) -# [END secretmanager_disable_secret_version] + print("Disabled secret version: {}".format(response.name)) + # [END secretmanager_disable_secret_version] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret from which to act') - parser.add_argument('version_id', help='id of the version to disable') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret from which to act") + parser.add_argument("version_id", help="id of the version to disable") args = parser.parse_args() disable_secret_version(args.project_id, args.secret_id, args.version_id) diff --git a/secretmanager/snippets/enable_secret_version.py b/secretmanager/snippets/enable_secret_version.py index c14e2bb0558c..c465f3f1a134 100644 --- a/secretmanager/snippets/enable_secret_version.py +++ b/secretmanager/snippets/enable_secret_version.py @@ -33,24 +33,24 @@ def enable_secret_version(project_id, secret_id, version_id): client = secretmanager.SecretManagerServiceClient() # Build the resource name of the secret version - name = client.secret_version_path(project_id, secret_id, version_id) + name = f"projects/{project_id}/secrets/{secret_id}/versions/{version_id}" # Disable the secret version. - response = client.enable_secret_version(name) + response = client.enable_secret_version(request={"name": name}) - print('Enabled secret version: {}'.format(response.name)) -# [END secretmanager_enable_secret_version] + print("Enabled secret version: {}".format(response.name)) + # [END secretmanager_enable_secret_version] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret from which to act') - parser.add_argument('version_id', help='id of the version to enable') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret from which to act") + parser.add_argument("version_id", help="id of the version to enable") args = parser.parse_args() enable_secret_version(args.project_id, args.secret_id, args.version_id) diff --git a/secretmanager/snippets/get_secret.py b/secretmanager/snippets/get_secret.py index 5eea886dd5f0..39b60aa3fe46 100644 --- a/secretmanager/snippets/get_secret.py +++ b/secretmanager/snippets/get_secret.py @@ -36,30 +36,29 @@ def get_secret(project_id, secret_id): name = client.secret_path(project_id, secret_id) # Get the secret. - response = client.get_secret(name) + response = client.get_secret(request={"name": name}) # Get the replication policy. - if response.replication.automatic: - replication = 'AUTOMATIC' - elif response.replication.user_managed: - replication = 'MANAGED' + if "automatic" in response.replication: + replication = "AUTOMATIC" + elif "user_managed" in response.replication: + replication = "MANAGED" else: - raise 'Unknown replication {}'.format(response.replication) + raise "Unknown replication {}".format(response.replication) # Print data about the secret. - print('Got secret {} with replication policy {}'.format( - response.name, replication)) -# [END secretmanager_get_secret] + print("Got secret {} with replication policy {}".format(response.name, replication)) + # [END secretmanager_get_secret] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret to get') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret to get") args = parser.parse_args() get_secret(args.project_id, args.secret_id) diff --git a/secretmanager/snippets/get_secret_version.py b/secretmanager/snippets/get_secret_version.py index 7ddb8a56d472..e38b4ccfe06d 100644 --- a/secretmanager/snippets/get_secret_version.py +++ b/secretmanager/snippets/get_secret_version.py @@ -34,26 +34,26 @@ def get_secret_version(project_id, secret_id, version_id): client = secretmanager.SecretManagerServiceClient() # Build the resource name of the secret version. - name = client.secret_version_path(project_id, secret_id, version_id) + name = f"projects/{project_id}/secrets/{secret_id}/versions/{version_id}" # Get the secret version. - response = client.get_secret_version(name) + response = client.get_secret_version(request={"name": name}) # Print information about the secret version. - state = response.State.Name(response.state) - print('Got secret version {} with state {}'.format(response.name, state)) -# [END secretmanager_get_secret_version] + state = response.state.name + print("Got secret version {} with state {}".format(response.name, state)) + # [END secretmanager_get_secret_version] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret from which to act') - parser.add_argument('version_id', help='id of the version to get') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret from which to act") + parser.add_argument("version_id", help="id of the version to get") args = parser.parse_args() get_secret_version(args.project_id, args.secret_id, args.version_id) diff --git a/secretmanager/snippets/iam_grant_access.py b/secretmanager/snippets/iam_grant_access.py index 3c3a7e780e50..ce2bb5f5f512 100644 --- a/secretmanager/snippets/iam_grant_access.py +++ b/secretmanager/snippets/iam_grant_access.py @@ -35,30 +35,28 @@ def iam_grant_access(project_id, secret_id, member): name = client.secret_path(project_id, secret_id) # Get the current IAM policy. - policy = client.get_iam_policy(name) + policy = client.get_iam_policy(request={"resource": name}) # Add the given member with access permissions. - policy.bindings.add( - role='roles/secretmanager.secretAccessor', - members=[member]) + policy.bindings.add(role="roles/secretmanager.secretAccessor", members=[member]) # Update the IAM Policy. - new_policy = client.set_iam_policy(name, policy) + new_policy = client.set_iam_policy(request={"resource": name, "policy": policy}) # Print data about the secret. - print('Updated IAM policy on {}'.format(secret_id)) -# [END secretmanager_iam_grant_access] + print("Updated IAM policy on {}".format(secret_id)) + # [END secretmanager_iam_grant_access] return new_policy -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret to get') - parser.add_argument('member', help='member to grant access') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret to get") + parser.add_argument("member", help="member to grant access") args = parser.parse_args() iam_grant_access(args.project_id, args.secret_id, args.member) diff --git a/secretmanager/snippets/iam_revoke_access.py b/secretmanager/snippets/iam_revoke_access.py index 385a52a52a90..648234d23d5b 100644 --- a/secretmanager/snippets/iam_revoke_access.py +++ b/secretmanager/snippets/iam_revoke_access.py @@ -35,31 +35,31 @@ def iam_revoke_access(project_id, secret_id, member): name = client.secret_path(project_id, secret_id) # Get the current IAM policy. - policy = client.get_iam_policy(name) + policy = client.get_iam_policy(request={"resource": name}) # Remove the given member's access permissions. - accessRole = 'roles/secretmanager.secretAccessor' + accessRole = "roles/secretmanager.secretAccessor" for b in list(policy.bindings): if b.role == accessRole and member in b.members: b.members.remove(member) # Update the IAM Policy. - new_policy = client.set_iam_policy(name, policy) + new_policy = client.set_iam_policy(request={"resource": name, "policy": policy}) # Print data about the secret. - print('Updated IAM policy on {}'.format(secret_id)) -# [END secretmanager_iam_revoke_access] + print("Updated IAM policy on {}".format(secret_id)) + # [END secretmanager_iam_revoke_access] return new_policy -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret to get') - parser.add_argument('member', help='member to revoke access') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret to get") + parser.add_argument("member", help="member to revoke access") args = parser.parse_args() iam_revoke_access(args.project_id, args.secret_id, args.member) diff --git a/secretmanager/snippets/list_secret_versions.py b/secretmanager/snippets/list_secret_versions.py index 2ff4434520f8..c60ac02b234f 100644 --- a/secretmanager/snippets/list_secret_versions.py +++ b/secretmanager/snippets/list_secret_versions.py @@ -36,17 +36,19 @@ def list_secret_versions(project_id, secret_id): parent = client.secret_path(project_id, secret_id) # List all secret versions. - for version in client.list_secret_versions(parent): - print('Found secret version: {}'.format(version.name)) + for version in client.list_secret_versions(request={"parent": parent}): + print("Found secret version: {}".format(version.name)) + + # [END secretmanager_list_secret_versions] -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('secret_id', help='id of the secret in which to list') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("secret_id", help="id of the secret in which to list") args = parser.parse_args() list_secret_versions(args.project_id, args.secret_id) diff --git a/secretmanager/snippets/list_secrets.py b/secretmanager/snippets/list_secrets.py index 0d0e798355ec..b07a0b03d3c2 100644 --- a/secretmanager/snippets/list_secrets.py +++ b/secretmanager/snippets/list_secrets.py @@ -32,19 +32,21 @@ def list_secrets(project_id): client = secretmanager.SecretManagerServiceClient() # Build the resource name of the parent project. - parent = client.project_path(project_id) + parent = f"projects/{project_id}" # List all secrets. - for secret in client.list_secrets(parent): - print('Found secret: {}'.format(secret.name)) + for secret in client.list_secrets(request={"parent": parent}): + print("Found secret: {}".format(secret.name)) + + # [END secretmanager_list_secrets] -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") args = parser.parse_args() list_secrets(args.project_id) diff --git a/secretmanager/snippets/quickstart.py b/secretmanager/snippets/quickstart.py index 68b1b0414e99..9386020918df 100644 --- a/secretmanager/snippets/quickstart.py +++ b/secretmanager/snippets/quickstart.py @@ -23,10 +23,10 @@ def quickstart(_project_id=None, _secret_id=None): from google.cloud import secretmanager # GCP project in which to store secrets in Secret Manager. - project_id = 'YOUR_PROJECT_ID' + project_id = "YOUR_PROJECT_ID" # ID of the secret to create. - secret_id = 'YOUR_SECRET_ID' + secret_id = "YOUR_SECRET_ID" # [END secretmanager_quickstart] project_id = _project_id @@ -36,29 +36,33 @@ def quickstart(_project_id=None, _secret_id=None): client = secretmanager.SecretManagerServiceClient() # Build the parent name from the project. - parent = client.project_path(project_id) + parent = f"projects/{project_id}" # Create the parent secret. - secret = client.create_secret(parent, secret_id, { - 'replication': { - 'automatic': {}, - }, - }) + secret = client.create_secret( + request={ + "parent": parent, + "secret_id": secret_id, + "secret": {"replication": {"automatic": {}}}, + } + ) # Add the secret version. - version = client.add_secret_version(secret.name, {'data': b'hello world!'}) + version = client.add_secret_version( + request={"parent": secret.name, "payload": {"data": b"hello world!"}} + ) # Access the secret version. - response = client.access_secret_version(version.name) + response = client.access_secret_version(request={"name": version.name}) # Print the secret payload. # # WARNING: Do not print the secret in a production environment - this # snippet is showing how to access the secret material. - payload = response.payload.data.decode('UTF-8') - print('Plaintext: {}'.format(payload)) + payload = response.payload.data.decode("UTF-8") + print("Plaintext: {}".format(payload)) # [END secretmanager_quickstart] -if __name__ == '__main__': +if __name__ == "__main__": quickstart() diff --git a/secretmanager/snippets/requirements.txt b/secretmanager/snippets/requirements.txt index da667b1c4b33..9da3902bed4c 100644 --- a/secretmanager/snippets/requirements.txt +++ b/secretmanager/snippets/requirements.txt @@ -1 +1 @@ -google-cloud-secret-manager==1.0.0 +google-cloud-secret-manager==1.0.0 \ No newline at end of file diff --git a/secretmanager/snippets/snippets_test.py b/secretmanager/snippets/snippets_test.py index 65f93be6b0f6..d48d306ecf1c 100644 --- a/secretmanager/snippets/snippets_test.py +++ b/secretmanager/snippets/snippets_test.py @@ -42,31 +42,33 @@ def client(): @pytest.fixture() def project_id(): - return os.environ['GOOGLE_CLOUD_PROJECT'] + return os.environ["GOOGLE_CLOUD_PROJECT"] @pytest.fixture() def iam_user(): - return 'serviceAccount:' + os.environ['GCLOUD_SECRETS_SERVICE_ACCOUNT'] + return "serviceAccount:" + os.environ["GCLOUD_SECRETS_SERVICE_ACCOUNT"] @pytest.fixture() def secret(client, project_id): - parent = client.project_path(project_id) - secret_id = 'python-secret-{}'.format(uuid.uuid4()) - - print('creating secret {}'.format(secret_id)) - secret = client.create_secret(parent, secret_id, { - 'replication': { - 'automatic': {}, - }, - }) + parent = f"projects/{project_id}" + secret_id = "python-secret-{}".format(uuid.uuid4()) + + print("creating secret {}".format(secret_id)) + secret = client.create_secret( + request={ + "parent": parent, + "secret_id": secret_id, + "secret": {"replication": {"automatic": {}}}, + } + ) yield project_id, secret_id - print('deleting secret {}'.format(secret_id)) + print("deleting secret {}".format(secret_id)) try: - client.delete_secret(secret.name) + client.delete_secret(request={"name": secret.name}) except exceptions.NotFound: # Secret was already deleted, probably in the test pass @@ -79,49 +81,51 @@ def secret(client, project_id): def secret_version(client, secret): project_id, secret_id = secret - print('adding secret version to {}'.format(secret_id)) + print("adding secret version to {}".format(secret_id)) parent = client.secret_path(project_id, secret_id) - payload = 'hello world!'.encode('UTF-8') - version = client.add_secret_version(parent, {'data': payload}) + payload = "hello world!".encode("UTF-8") + version = client.add_secret_version( + request={"parent": parent, "payload": {"data": payload}} + ) - yield project_id, secret_id, version.name.rsplit('/', 1)[-1] + yield project_id, secret_id, version.name.rsplit("/", 1)[-1] another_secret_version = secret_version def test_quickstart(project_id): - secret_id = 'python-secret-{}'.format(uuid.uuid4()) + secret_id = "python-secret-{}".format(uuid.uuid4()) quickstart(project_id, secret_id) def test_access_secret_version(secret_version): project_id, secret_id, version_id = secret_version version = access_secret_version(project_id, secret_id, version_id) - assert version.payload.data == b'hello world!' + assert version.payload.data == b"hello world!" def test_add_secret_version(secret): project_id, secret_id = secret - payload = 'test123' + payload = "test123" version = add_secret_version(project_id, secret_id, payload) assert secret_id in version.name def test_create_secret(client, project_id): - secret_id = 'python-secret-{}'.format(uuid.uuid4()) + secret_id = "python-secret-{}".format(uuid.uuid4()) secret = create_secret(project_id, secret_id) assert secret_id in secret.name - client.delete_secret(secret.name) + client.delete_secret(request={"name": secret.name}) def test_delete_secret(client, secret): project_id, secret_id = secret delete_secret(project_id, secret_id) with pytest.raises(exceptions.NotFound): - print('{}'.format(client)) - name = client.secret_version_path(project_id, secret_id, 'latest') - client.access_secret_version(name) + print("{}".format(client)) + name = f"projects/{project_id}/secrets/{secret_id}/versions/latest" + client.access_secret_version(request={"name": name}) def test_destroy_secret_version(client, secret_version): @@ -133,10 +137,10 @@ def test_destroy_secret_version(client, secret_version): def test_enable_disable_secret_version(client, secret_version): project_id, secret_id, version_id = secret_version version = disable_secret_version(project_id, secret_id, version_id) - assert version.state == secretmanager.enums.SecretVersion.State.DISABLED + assert version.state == secretmanager.SecretVersion.State.DISABLED version = enable_secret_version(project_id, secret_id, version_id) - assert version.state == secretmanager.enums.SecretVersion.State.ENABLED + assert version.state == secretmanager.SecretVersion.State.ENABLED def test_get_secret_version(client, secret_version): @@ -188,4 +192,4 @@ def test_list_secrets(capsys, secret, another_secret): def test_update_secret(secret): project_id, secret_id = secret secret = update_secret(project_id, secret_id) - assert secret.labels['secretmanager'] == 'rocks' + assert secret.labels["secretmanager"] == "rocks" diff --git a/secretmanager/snippets/update_secret.py b/secretmanager/snippets/update_secret.py index 8c97d919c291..1dd8ec7bdfa9 100644 --- a/secretmanager/snippets/update_secret.py +++ b/secretmanager/snippets/update_secret.py @@ -32,23 +32,25 @@ def update_secret(project_id, secret_id): name = client.secret_path(project_id, secret_id) # Update the secret. - secret = {'name': name, 'labels': {'secretmanager': 'rocks'}} - update_mask = {'paths': ['labels']} - response = client.update_secret(secret, update_mask) + secret = {"name": name, "labels": {"secretmanager": "rocks"}} + update_mask = {"paths": ["labels"]} + response = client.update_secret( + request={"secret": secret, "update_mask": update_mask} + ) # Print the new secret name. - print('Updated secret: {}'.format(response.name)) + print("Updated secret: {}".format(response.name)) # [END secretmanager_update_secret] return response -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='id of the GCP project') - parser.add_argument('--secret-id', required=True) + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument("project_id", help="id of the GCP project") + parser.add_argument("--secret-id", required=True) args = parser.parse_args() update_secret(args.project_id, args.secret_id)