Pass KeyId to EncryptResponse (kubernetes#2535)

GlassOfWhiskey · web-flow · commit 7eeef2f28054 · 2024-03-05T09:06:35.000-08:00
diff --git a/pkg/kms/server/server.go b/pkg/kms/server/server.go
@@ -148,5 +148,5 @@ func (s *KMSserver) Encrypt(ctx context.Context, req *pb.EncryptRequest) (*pb.En
 		klog.V(4).Infof("Failed to encrypt data %v: ", err)
 		return nil, err
 	}
-	return &pb.EncryptResponse{Ciphertext: cipher}, nil
+	return &pb.EncryptResponse{Ciphertext: cipher, KeyId: s.cfg.KeyManager.KeyID}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -148,5 +148,5 @@ func (s KMSserver) Encrypt(ctx context.Context, req pb.EncryptRequest) (*pb.En`
`148`	`148`	`klog.V(4).Infof("Failed to encrypt data %v: ", err)`
`149`	`149`	`return nil, err`
`150`	`150`	`}`
`151`		`- return &pb.EncryptResponse{Ciphertext: cipher}, nil`
	`151`	`+ return &pb.EncryptResponse{Ciphertext: cipher, KeyId: s.cfg.KeyManager.KeyID}, nil`
`152`	`152`	`}`