Skip to content

Commit 2ee7adb

Browse files
sethvargoamanda-tarafa
authored andcommitted
Use helpers instead of request objects
1 parent b539414 commit 2ee7adb

45 files changed

Lines changed: 218 additions & 358 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

kms/api/Kms.Samples.Tests/CreateKeyAsymmetricDecryptTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ public void CreatesKey()
3939

4040
// Get the key.
4141
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
42-
var key = client.GetCryptoKey(new GetCryptoKeyRequest
43-
{
44-
CryptoKeyName = result.CryptoKeyName,
45-
});
42+
var key = client.GetCryptoKey(result.CryptoKeyName);
4643

4744
Assert.Equal(CryptoKey.Types.CryptoKeyPurpose.AsymmetricDecrypt, key.Purpose);
4845
Assert.Equal(CryptoKeyVersion.Types.CryptoKeyVersionAlgorithm.RsaDecryptOaep2048Sha256, key.VersionTemplate.Algorithm);

kms/api/Kms.Samples.Tests/CreateKeyAsymmetricSignTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ public void CreatesKey()
3939

4040
// Get the key.
4141
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
42-
var key = client.GetCryptoKey(new GetCryptoKeyRequest
43-
{
44-
CryptoKeyName = result.CryptoKeyName,
45-
});
42+
var key = client.GetCryptoKey(result.CryptoKeyName);
4643

4744
Assert.Equal(CryptoKey.Types.CryptoKeyPurpose.AsymmetricSign, key.Purpose);
4845
Assert.Equal(CryptoKeyVersion.Types.CryptoKeyVersionAlgorithm.RsaSignPkcs12048Sha256, key.VersionTemplate.Algorithm);

kms/api/Kms.Samples.Tests/CreateKeyHsmTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ public void CreatesKey()
3939

4040
// Get the key.
4141
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
42-
var key = client.GetCryptoKey(new GetCryptoKeyRequest
43-
{
44-
CryptoKeyName = result.CryptoKeyName,
45-
});
42+
var key = client.GetCryptoKey(result.CryptoKeyName);
4643

4744
Assert.Equal(ProtectionLevel.Hsm, key.VersionTemplate.ProtectionLevel);
4845
}

kms/api/Kms.Samples.Tests/CreateKeyLabelsTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ public void CreatesKey()
3939

4040
// Get the key.
4141
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
42-
var key = client.GetCryptoKey(new GetCryptoKeyRequest
43-
{
44-
CryptoKeyName = result.CryptoKeyName,
45-
});
42+
var key = client.GetCryptoKey(result.CryptoKeyName);
4643

4744
Assert.Equal("alpha", key.Labels["team"]);
4845
Assert.Equal("cc1234", key.Labels["cost_center"]);

kms/api/Kms.Samples.Tests/CreateKeyRingTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ public void CreatesKeyRing()
4747

4848
// Get the key ring.
4949
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
50-
var keyRing = client.GetKeyRing(new GetKeyRingRequest
51-
{
52-
KeyRingName = result.KeyRingName,
53-
});
50+
var keyRing = client.GetKeyRing(result.KeyRingName);
5451

5552
Assert.Contains(_keyRingId, keyRing.Name);
5653
}

kms/api/Kms.Samples.Tests/CreateKeyRotationScheduleTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ public void CreatesKey()
3939

4040
// Get the key.
4141
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
42-
var key = client.GetCryptoKey(new GetCryptoKeyRequest
43-
{
44-
CryptoKeyName = result.CryptoKeyName,
45-
});
42+
var key = client.GetCryptoKey(result.CryptoKeyName);
4643

4744
Assert.Equal(2_592_000, key.RotationPeriod.Seconds);
4845
Assert.NotNull(key.NextRotationTime);

kms/api/Kms.Samples.Tests/CreateKeySymmetricEncryptDecryptTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ public void CreatesKey()
3939

4040
// Get the key.
4141
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
42-
var key = client.GetCryptoKey(new GetCryptoKeyRequest
43-
{
44-
CryptoKeyName = result.CryptoKeyName,
45-
});
42+
var key = client.GetCryptoKey(result.CryptoKeyName);
4643

4744
Assert.Equal(CryptoKey.Types.CryptoKeyPurpose.EncryptDecrypt, key.Purpose);
4845
Assert.Equal(CryptoKeyVersion.Types.CryptoKeyVersionAlgorithm.GoogleSymmetricEncryption, key.VersionTemplate.Algorithm);

kms/api/Kms.Samples.Tests/CreateKeyVersionTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ public void CreatesKeyVersion()
3838

3939
// Get the key version.
4040
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
41-
var response = client.GetCryptoKeyVersion(new GetCryptoKeyVersionRequest
42-
{
43-
CryptoKeyVersionName = result.CryptoKeyVersionName,
44-
});
41+
var response = client.GetCryptoKeyVersion(result.CryptoKeyVersionName);
4542

4643
Assert.NotNull(response.CryptoKeyVersionName.CryptoKeyVersionId);
4744
}

kms/api/Kms.Samples.Tests/DecryptAsymmetricTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ public void DecryptsDataa()
3939

4040
// Get the public key.
4141
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
42-
var publicKey = client.GetPublicKey(new GetPublicKeyRequest
43-
{
44-
CryptoKeyVersionName = new CryptoKeyVersionName(_fixture.ProjectId, _fixture.LocationId, _fixture.KeyRingId, _fixture.AsymmetricDecryptKeyId, "1"),
45-
});
42+
CryptoKeyVersionName keyVersionName = new CryptoKeyVersionName(_fixture.ProjectId, _fixture.LocationId, _fixture.KeyRingId, _fixture.AsymmetricDecryptKeyId, "1");
43+
var publicKey = client.GetPublicKey(keyVersionName);
4644

4745
// Split the key into blocks and base64-decode the PEM parts.
4846
var blocks = publicKey.Pem.Split("-", StringSplitOptions.RemoveEmptyEntries);

kms/api/Kms.Samples.Tests/DecryptSymmetricTests.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ public void DecryptsData()
3737

3838
// Create some ciphertext.
3939
KeyManagementServiceClient client = KeyManagementServiceClient.Create();
40-
var result = client.Encrypt(new EncryptRequest
41-
{
42-
ResourceName = new CryptoKeyName(_fixture.ProjectId, _fixture.LocationId, _fixture.KeyRingId, _fixture.SymmetricKeyId),
43-
Plaintext = ByteString.CopyFromUtf8(plaintext),
44-
});
40+
CryptoKeyName keyName = new CryptoKeyName(_fixture.ProjectId, _fixture.LocationId, _fixture.KeyRingId, _fixture.SymmetricKeyId);
41+
var result = client.Encrypt(keyName, ByteString.CopyFromUtf8(plaintext));
4542

4643
// Run the sample code.
4744
var response = _sample.DecryptSymmetric(

0 commit comments

Comments
 (0)