chore: upgrade kms samples to new client surface (#1950)

Author: bshaffer

kms/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/cloud-kms": "^1.12.0"
+        "google/cloud-kms": "^1.20"
     }
 }

kms/src/create_key_asymmetric_decrypt.php

@@ -20,11 +20,12 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_asymmetric_decrypt]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyRequest;
 use Google\Cloud\Kms\V1\CryptoKey;
 use Google\Cloud\Kms\V1\CryptoKey\CryptoKeyPurpose;
 use Google\Cloud\Kms\V1\CryptoKeyVersion\CryptoKeyVersionAlgorithm;
 use Google\Cloud\Kms\V1\CryptoKeyVersionTemplate;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 use Google\Protobuf\Duration;
 
 function create_key_asymmetric_decrypt(
@@ -52,7 +53,11 @@ function create_key_asymmetric_decrypt(
         );
 
     // Call the API.
-    $createdKey = $client->createCryptoKey($keyRingName, $id, $key);
+    $createCryptoKeyRequest = (new CreateCryptoKeyRequest())
+        ->setParent($keyRingName)
+        ->setCryptoKeyId($id)
+        ->setCryptoKey($key);
+    $createdKey = $client->createCryptoKey($createCryptoKeyRequest);
     printf('Created asymmetric decryption key: %s' . PHP_EOL, $createdKey->getName());
 
     return $createdKey;

kms/src/create_key_asymmetric_sign.php

@@ -20,11 +20,12 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_asymmetric_sign]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyRequest;
 use Google\Cloud\Kms\V1\CryptoKey;
 use Google\Cloud\Kms\V1\CryptoKey\CryptoKeyPurpose;
 use Google\Cloud\Kms\V1\CryptoKeyVersion\CryptoKeyVersionAlgorithm;
 use Google\Cloud\Kms\V1\CryptoKeyVersionTemplate;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 use Google\Protobuf\Duration;
 
 function create_key_asymmetric_sign(
@@ -52,7 +53,11 @@ function create_key_asymmetric_sign(
         );
 
     // Call the API.
-    $createdKey = $client->createCryptoKey($keyRingName, $id, $key);
+    $createCryptoKeyRequest = (new CreateCryptoKeyRequest())
+        ->setParent($keyRingName)
+        ->setCryptoKeyId($id)
+        ->setCryptoKey($key);
+    $createdKey = $client->createCryptoKey($createCryptoKeyRequest);
     printf('Created asymmetric signing key: %s' . PHP_EOL, $createdKey->getName());
 
     return $createdKey;

kms/src/create_key_hsm.php

@@ -20,11 +20,12 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_hsm]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyRequest;
 use Google\Cloud\Kms\V1\CryptoKey;
 use Google\Cloud\Kms\V1\CryptoKey\CryptoKeyPurpose;
 use Google\Cloud\Kms\V1\CryptoKeyVersion\CryptoKeyVersionAlgorithm;
 use Google\Cloud\Kms\V1\CryptoKeyVersionTemplate;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 use Google\Cloud\Kms\V1\ProtectionLevel;
 use Google\Protobuf\Duration;
 
@@ -54,7 +55,11 @@ function create_key_hsm(
         );
 
     // Call the API.
-    $createdKey = $client->createCryptoKey($keyRingName, $id, $key);
+    $createCryptoKeyRequest = (new CreateCryptoKeyRequest())
+        ->setParent($keyRingName)
+        ->setCryptoKeyId($id)
+        ->setCryptoKey($key);
+    $createdKey = $client->createCryptoKey($createCryptoKeyRequest);
     printf('Created hsm key: %s' . PHP_EOL, $createdKey->getName());
 
     return $createdKey;

kms/src/create_key_labels.php

@@ -20,11 +20,12 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_labels]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyRequest;
 use Google\Cloud\Kms\V1\CryptoKey;
 use Google\Cloud\Kms\V1\CryptoKey\CryptoKeyPurpose;
 use Google\Cloud\Kms\V1\CryptoKeyVersion\CryptoKeyVersionAlgorithm;
 use Google\Cloud\Kms\V1\CryptoKeyVersionTemplate;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 
 function create_key_labels(
     string $projectId = 'my-project',
@@ -50,7 +51,11 @@ function create_key_labels(
         ]);
 
     // Call the API.
-    $createdKey = $client->createCryptoKey($keyRingName, $id, $key);
+    $createCryptoKeyRequest = (new CreateCryptoKeyRequest())
+        ->setParent($keyRingName)
+        ->setCryptoKeyId($id)
+        ->setCryptoKey($key);
+    $createdKey = $client->createCryptoKey($createCryptoKeyRequest);
     printf('Created labeled key: %s' . PHP_EOL, $createdKey->getName());
 
     return $createdKey;

kms/src/create_key_mac.php

@@ -20,11 +20,12 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_mac]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyRequest;
 use Google\Cloud\Kms\V1\CryptoKey;
 use Google\Cloud\Kms\V1\CryptoKey\CryptoKeyPurpose;
 use Google\Cloud\Kms\V1\CryptoKeyVersion\CryptoKeyVersionAlgorithm;
 use Google\Cloud\Kms\V1\CryptoKeyVersionTemplate;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 use Google\Protobuf\Duration;
 
 function create_key_mac(
@@ -52,7 +53,11 @@ function create_key_mac(
         );
 
     // Call the API.
-    $createdKey = $client->createCryptoKey($keyRingName, $id, $key);
+    $createCryptoKeyRequest = (new CreateCryptoKeyRequest())
+        ->setParent($keyRingName)
+        ->setCryptoKeyId($id)
+        ->setCryptoKey($key);
+    $createdKey = $client->createCryptoKey($createCryptoKeyRequest);
     printf('Created mac key: %s' . PHP_EOL, $createdKey->getName());
 
     return $createdKey;

kms/src/create_key_ring.php

@@ -20,7 +20,8 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_ring]
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateKeyRingRequest;
 use Google\Cloud\Kms\V1\KeyRing;
 
 function create_key_ring(
@@ -38,7 +39,11 @@ function create_key_ring(
     $keyRing = new KeyRing();
 
     // Call the API.
-    $createdKeyRing = $client->createKeyRing($locationName, $id, $keyRing);
+    $createKeyRingRequest = (new CreateKeyRingRequest())
+        ->setParent($locationName)
+        ->setKeyRingId($id)
+        ->setKeyRing($keyRing);
+    $createdKeyRing = $client->createKeyRing($createKeyRingRequest);
     printf('Created key ring: %s' . PHP_EOL, $createdKeyRing->getName());
 
     return $createdKeyRing;

kms/src/create_key_rotation_schedule.php

@@ -20,11 +20,12 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_rotation_schedule]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyRequest;
 use Google\Cloud\Kms\V1\CryptoKey;
 use Google\Cloud\Kms\V1\CryptoKey\CryptoKeyPurpose;
 use Google\Cloud\Kms\V1\CryptoKeyVersion\CryptoKeyVersionAlgorithm;
 use Google\Cloud\Kms\V1\CryptoKeyVersionTemplate;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 use Google\Protobuf\Duration;
 use Google\Protobuf\Timestamp;
 
@@ -57,7 +58,11 @@ function create_key_rotation_schedule(
         );
 
     // Call the API.
-    $createdKey = $client->createCryptoKey($keyRingName, $id, $key);
+    $createCryptoKeyRequest = (new CreateCryptoKeyRequest())
+        ->setParent($keyRingName)
+        ->setCryptoKeyId($id)
+        ->setCryptoKey($key);
+    $createdKey = $client->createCryptoKey($createCryptoKeyRequest);
     printf('Created key with rotation: %s' . PHP_EOL, $createdKey->getName());
 
     return $createdKey;

kms/src/create_key_symmetric_encrypt_decrypt.php

@@ -20,11 +20,12 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_symmetric_encrypt_decrypt]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyRequest;
 use Google\Cloud\Kms\V1\CryptoKey;
 use Google\Cloud\Kms\V1\CryptoKey\CryptoKeyPurpose;
 use Google\Cloud\Kms\V1\CryptoKeyVersion\CryptoKeyVersionAlgorithm;
 use Google\Cloud\Kms\V1\CryptoKeyVersionTemplate;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 
 function create_key_symmetric_encrypt_decrypt(
     string $projectId = 'my-project',
@@ -46,7 +47,11 @@ function create_key_symmetric_encrypt_decrypt(
         );
 
     // Call the API.
-    $createdKey = $client->createCryptoKey($keyRingName, $id, $key);
+    $createCryptoKeyRequest = (new CreateCryptoKeyRequest())
+        ->setParent($keyRingName)
+        ->setCryptoKeyId($id)
+        ->setCryptoKey($key);
+    $createdKey = $client->createCryptoKey($createCryptoKeyRequest);
     printf('Created symmetric key: %s' . PHP_EOL, $createdKey->getName());
 
     return $createdKey;

kms/src/create_key_version.php

@@ -20,8 +20,9 @@
 namespace Google\Cloud\Samples\Kms;
 
 // [START kms_create_key_version]
+use Google\Cloud\Kms\V1\Client\KeyManagementServiceClient;
+use Google\Cloud\Kms\V1\CreateCryptoKeyVersionRequest;
 use Google\Cloud\Kms\V1\CryptoKeyVersion;
-use Google\Cloud\Kms\V1\KeyManagementServiceClient;
 
 function create_key_version(
     string $projectId = 'my-project',
@@ -39,7 +40,10 @@ function create_key_version(
     $version = new CryptoKeyVersion();
 
     // Call the API.
-    $createdVersion = $client->createCryptoKeyVersion($keyName, $version);
+    $createCryptoKeyVersionRequest = (new CreateCryptoKeyVersionRequest())
+        ->setParent($keyName)
+        ->setCryptoKeyVersion($version);
+    $createdVersion = $client->createCryptoKeyVersion($createCryptoKeyVersionRequest);
     printf('Created key version: %s' . PHP_EOL, $createdVersion->getName());
 
     return $createdVersion;