Skip to content

Commit 73e585c

Browse files
authored
Minor check for null client (#2462)
* Minor fix for handling null config * Revert "Minor fix for handling null config" This reverts commit 180bf60. * Add null check for client
1 parent 113a771 commit 73e585c

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

src/Confluent.SchemaRegistry.Encryption/FieldEncryptionExecutor.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,10 @@ private int GetDekExpiryDays(RuleContext ctx)
241241

242242
private async Task<RegisteredKek> RetrieveKekFromRegistry(KekId key)
243243
{
244+
if (executor.Client == null)
245+
{
246+
throw new RuleException("Pass a serializer/deserializer config to initialize the client");
247+
}
244248
try
245249
{
246250
return await executor.Client.GetKekAsync(key.Name, !key.LookupDeletedKeks)
@@ -259,6 +263,10 @@ private async Task<RegisteredKek> RetrieveKekFromRegistry(KekId key)
259263

260264
private async Task<RegisteredKek> StoreKekToRegistry(KekId key, string kmsType, string kmsKeyId, bool shared)
261265
{
266+
if (executor.Client == null)
267+
{
268+
throw new RuleException("Pass a serializer/deserializer config to initialize the client");
269+
}
262270
Kek kek = new Kek
263271
{
264272
Name = key.Name,
@@ -368,6 +376,10 @@ private bool IsExpired(RuleContext ctx, RegisteredDek dek)
368376

369377
private async Task<RegisteredDek> RetrieveDekFromRegistry(DekId key)
370378
{
379+
if (executor.Client == null)
380+
{
381+
throw new RuleException("Pass a serializer/deserializer config to initialize the client");
382+
}
371383
try
372384
{
373385
RegisteredDek dek;
@@ -400,7 +412,10 @@ private async Task<RegisteredDek> RetrieveDekFromRegistry(DekId key)
400412

401413
private async Task<RegisteredDek> StoreDekToRegistry(DekId key, byte[] encryptedDek)
402414
{
403-
415+
if (executor.Client == null)
416+
{
417+
throw new RuleException("Pass a serializer/deserializer config to initialize the client");
418+
}
404419
string encryptedDekStr = encryptedDek != null ? Convert.ToBase64String(encryptedDek) : null;
405420
Dek dek = new Dek
406421
{

0 commit comments

Comments
 (0)