rbd: Use EncryptionTypeNone

Signed-off-by: Marcel Lauhoff <marcel.lauhoff@suse.com>
ceph · Oct 17, 2022 · dc7ba68 · dc7ba68
1 parent 2abfafd
commit dc7ba68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/rbd/encryption.go b/internal/rbd/encryption.go
@@ -309,8 +309,6 @@ func (ri *rbdImage) initKMS(ctx context.Context, volOptions, credentials map[str
 	kmsID, encType, err := ParseEncryptionOpts(ctx, volOptions, rbdDefaultEncryptionType)
 	if err != nil {
 		return err
-	} else if kmsID == "" {
-		return nil
 	}
 
 	switch encType {
@@ -320,6 +318,8 @@ func (ri *rbdImage) initKMS(ctx context.Context, volOptions, credentials map[str
 		err = ri.configureFileEncryption(kmsID, credentials)
 	case util.EncryptionTypeInvalid:
 		return fmt.Errorf("invalid encryption type")
+	case util.EncryptionTypeNone:
+		return nil
 	}
 
 	if err != nil {
@@ -342,7 +342,7 @@ func ParseEncryptionOpts(
 	)
 	encrypted, ok = volOptions["encrypted"]
 	if !ok {
-		return "", util.EncryptionTypeInvalid, err
+		return "", util.EncryptionTypeNone, nil
 	}
 	kmsID, err = util.FetchEncryptionKMSID(encrypted, volOptions["encryptionKMSID"])
 	if err != nil {

diff --git a/internal/rbd/rbd_journal.go b/internal/rbd/rbd_journal.go
@@ -94,7 +94,7 @@ func getEncryptionConfig(rbdVol *rbdVolume) (string, util.EncryptionType) {
 	case rbdVol.isFileEncrypted():
 		return rbdVol.fileEncryption.GetID(), util.EncryptionTypeFile
 	default:
-		return "", util.EncryptionTypeInvalid
+		return "", util.EncryptionTypeNone
 	}
 }
 
@@ -141,7 +141,7 @@ func checkSnapCloneExists(
 	defer j.Destroy()
 
 	snapData, err := j.CheckReservation(ctx, rbdSnap.JournalPool,
-		rbdSnap.RequestName, rbdSnap.NamePrefix, rbdSnap.RbdImageName, "", util.EncryptionTypeInvalid)
+		rbdSnap.RequestName, rbdSnap.NamePrefix, rbdSnap.RbdImageName, "", util.EncryptionTypeNone)
 	if err != nil {
 		return false, err
 	}
@@ -572,7 +572,7 @@ func RegenerateJournal(
 
 	rbdVol.Owner = owner
 
-	kmsID, encryptionType, err = ParseEncryptionOpts(ctx, volumeAttributes, util.EncryptionTypeInvalid)
+	kmsID, encryptionType, err = ParseEncryptionOpts(ctx, volumeAttributes, util.EncryptionTypeNone)
 	if err != nil {
 		return "", err
 	}