Skip to content

Commit

Permalink
Incoporated review comments
Browse files Browse the repository at this point in the history
Signed-off-by: Shubhendu Ram Tripathi <[email protected]>
  • Loading branch information
shtripat committed May 17, 2023
1 parent 4c8ff91 commit 2e4fa01
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions kestest/gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func testCreateKey(ctx context.Context, store kv.Store[string, []byte], t *testi
defer server.Close()
client := server.Client()

defer clean(ctx, client, "my-key*", t)
defer clean(ctx, client, t)

for i, test := range createKeyTests {
err := client.CreateKey(ctx, test.Name)
Expand Down Expand Up @@ -180,7 +180,7 @@ func testImportKey(ctx context.Context, store kv.Store[string, []byte], t *testi
defer server.Close()
client := server.Client()

defer clean(ctx, client, "my-key*", t)
defer clean(ctx, client, t)

for i, test := range importKeyTests {
err := client.ImportKey(ctx, test.Name, test.Key)
Expand Down Expand Up @@ -213,7 +213,7 @@ func testGenerateKey(ctx context.Context, store kv.Store[string, []byte], t *tes
defer server.Close()
client := server.Client()

defer clean(ctx, client, "my-key*", t)
defer clean(ctx, client, t)

if err := client.CreateKey(ctx, KeyName); err != nil {
t.Fatalf("Failed to create %q: %v", KeyName, err)
Expand Down Expand Up @@ -262,7 +262,7 @@ func testEncryptKey(ctx context.Context, store kv.Store[string, []byte], t *test
defer server.Close()
client := server.Client()

defer clean(ctx, client, "my-key*", t)
defer clean(ctx, client, t)

if err := client.CreateKey(ctx, KeyName); err != nil {
t.Fatalf("Failed to create %q: %v", KeyName, err)
Expand Down Expand Up @@ -320,7 +320,7 @@ func testDecryptKey(ctx context.Context, store kv.Store[string, []byte], t *test
defer server.Close()
client := server.Client()

defer clean(ctx, client, "my-key*", t)
defer clean(ctx, client, t)

const KeyValue = "pQLPe6/f87AMSItvZzEbrxYdRUzmM81ziXF95HOFE4Y="
if err := client.ImportKey(ctx, KeyName, mustDecodeB64(KeyValue)); err != nil {
Expand Down Expand Up @@ -393,7 +393,7 @@ func testDecryptKeyAll(ctx context.Context, store kv.Store[string, []byte], t *t
defer server.Close()
client := server.Client()

defer clean(ctx, client, "my-key*", t)
defer clean(ctx, client, t)

const KeyValue = "pQLPe6/f87AMSItvZzEbrxYdRUzmM81ziXF95HOFE4Y="
if err := client.ImportKey(ctx, KeyName, mustDecodeB64(KeyValue)); err != nil {
Expand Down Expand Up @@ -627,8 +627,8 @@ func mustDecodeB64(s string) []byte {
return b
}

func clean(ctx context.Context, client *kes.Client, pattern string, t *testing.T) {
iter, err := client.ListKeys(ctx, pattern)
func clean(ctx context.Context, client *kes.Client, t *testing.T) {
iter, err := client.ListKeys(ctx, "*")
if err != nil {
t.Fatalf("Cleanup: failed to list keys: %v", err)
}
Expand Down

0 comments on commit 2e4fa01

Please sign in to comment.