From 9bd10d2698e98a6ffa16cae4c51d8478ba004769 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 1 Oct 2020 09:10:10 +0200 Subject: [PATCH] cephfs: newVolumeOptions() does not need all secrets, only credentials There is no need to pass all secrets on to newVolumeOptions(), it only needs the credentials. As the caller of newVolumeOptions() already has the credentials generated, just pass them along instead of the raw secrets. Signed-off-by: Niels de Vos --- internal/cephfs/controllerserver.go | 2 +- internal/cephfs/volumeoptions.go | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go index d62ca53de..799766cbc 100644 --- a/internal/cephfs/controllerserver.go +++ b/internal/cephfs/controllerserver.go @@ -151,7 +151,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol } defer cs.VolumeLocks.Release(requestName) - volOptions, err := newVolumeOptions(ctx, requestName, req, secret) + volOptions, err := newVolumeOptions(ctx, requestName, req, cr) if err != nil { util.ErrorLog(ctx, "validation and extraction of volume options failed: %v", err) return nil, status.Error(codes.InvalidArgument, err.Error()) diff --git a/internal/cephfs/volumeoptions.go b/internal/cephfs/volumeoptions.go index e2e082502..916ae03f0 100644 --- a/internal/cephfs/volumeoptions.go +++ b/internal/cephfs/volumeoptions.go @@ -171,7 +171,7 @@ func getClusterInformation(options map[string]string) (*util.ClusterInfo, error) // newVolumeOptions generates a new instance of volumeOptions from the provided // CSI request parameters. func newVolumeOptions(ctx context.Context, requestName string, req *csi.CreateVolumeRequest, - secret map[string]string) (*volumeOptions, error) { + cr *util.Credentials) (*volumeOptions, error) { var ( opts volumeOptions err error @@ -210,12 +210,6 @@ func newVolumeOptions(ctx context.Context, requestName string, req *csi.CreateVo opts.RequestName = requestName - cr, err := util.NewAdminCredentials(secret) - if err != nil { - return nil, err - } - defer cr.DeleteCredentials() - err = opts.Connect(cr) if err != nil { return nil, err