Skip to content

fix: use crypto_key_path instead of crypto_key_path_path#3319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcf-merge-on-green merged 5 commits into from
Apr 22, 2020
Merged

fix: use crypto_key_path instead of crypto_key_path_path#3319

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
340fbad
fix: use `crytpo_key_path` instead of `crypto_key_path_path`
busunkim96 Apr 9, 2020
a71df4a
chore: fix lint
busunkim96 Apr 9, 2020
2fb5f96
Merge branch 'master' into fix-crypto-key-path
busunkim96 Apr 10, 2020
b9547b3
Merge branch 'master' into fix-crypto-key-path
busunkim96 Apr 10, 2020
b336029
Merge branch 'master' into fix-crypto-key-path
Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions kms/api-client/snippets.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,7 @@ def encrypt_symmetric(project_id, location_id, key_ring_id, crypto_key_id,
client = kms_v1.KeyManagementServiceClient()

# The resource name of the CryptoKey.
name = client.crypto_key_path_path(project_id, location_id, key_ring_id,
crypto_key_id)
name = client.crypto_key_path(project_id, location_id, key_ring_id, crypto_key_id)

# Use the KMS API to encrypt the data.
response = client.encrypt(name, plaintext)
Expand All@@ -94,8 +93,7 @@ def decrypt_symmetric(project_id, location_id, key_ring_id, crypto_key_id,
client = kms_v1.KeyManagementServiceClient()

# The resource name of the CryptoKey.
name = client.crypto_key_path_path(project_id, location_id, key_ring_id,
crypto_key_id)
name = client.crypto_key_path(project_id, location_id, key_ring_id, crypto_key_id)
# Use the KMS API to decrypt the data.
response = client.decrypt(name, ciphertext)
return response.plaintext
Expand DownExpand Up@@ -219,8 +217,7 @@ def add_member_to_crypto_key_policy(
client = kms_v1.KeyManagementServiceClient()

# The resource name of the CryptoKey.
resource = client.crypto_key_path_path(project_id, location_id,
key_ring_id, crypto_key_id)
resource = client.crypto_key_path(project_id, location_id, key_ring_id, crypto_key_id)
# Get the current IAM policy.
policy = client.get_iam_policy(resource)

Expand DownExpand Up@@ -282,8 +279,8 @@ def remove_member_from_crypto_key_policy(
client = kms_v1.KeyManagementServiceClient()

# The resource name of the CryptoKey.
resource = client.crypto_key_path_path(project_id, location_id,
key_ring_id, crypto_key_id)
resource = client.crypto_key_path(project_id, location_id, key_ring_id, crypto_key_id)

# Get the current IAM policy.
policy = client.get_iam_policy(resource)

Expand DownExpand Up@@ -365,8 +362,7 @@ def get_crypto_key_policy(project_id, location_id, key_ring_id, crypto_key_id):
client = kms_v1.KeyManagementServiceClient()

# The resource name of the CryptoKey.
resource = client.crypto_key_path_path(project_id, location_id,
key_ring_id, crypto_key_id)
resource = client.crypto_key_path(project_id, location_id, key_ring_id, crypto_key_id)

# Get the current IAM policy.
policy = client.get_iam_policy(resource)
Expand Down