Allow using camelCase and snake_case for encryption methods

Author: imobachgs

rust/agama-lib/share/storage.schema.json

@@ -886,7 +886,7 @@
     },
     "encryptionSwap": {
       "description": "Swap encryptions.",
-      "enum": ["protected_swap", "secure_swap", "random_swap"]
+      "enum": ["protected_swap", "secure_swap", "random_swap", "protectedSwap", "secureSwap", "randomSwap"]
     },
     "encryptionPassword": {
       "description": "Password to use when creating a new encryption device.",

service/lib/agama/storage/config_conversions/from_json_conversions/encryption.rb

@@ -130,7 +130,9 @@ def swap_encryption_conversions
             return {} unless encryption_json.is_a?(String)
 
             # TODO: Report issue if the schema admits an unknown method.
-            method = Y2Storage::EncryptionMethod.find(encryption_json.to_sym)
+            # Normalize camelCase to snake_case (y2storage uses "random_swap", "tmp_fde", etc.).
+            normalized = encryption_json.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+            method = Y2Storage::EncryptionMethod.find(normalized.to_sym)
             return {} unless method
 
             {

service/test/agama/storage/config_conversions/from_json_conversions/examples.rb

@@ -248,6 +248,72 @@
         expect(encryption.label).to be_nil
       end
     end
+
+    context "if 'encryption' is 'random_swap' (snake_case)" do
+      let(:encryption) { "random_swap" }
+
+      it "sets #encryption to the expected value" do
+        config = subject.convert
+        encryption = config.encryption
+        expect(encryption).to be_a(Agama::Storage::Configs::Encryption)
+        expect(encryption.method).to eq(Y2Storage::EncryptionMethod::RANDOM_SWAP)
+      end
+    end
+
+    context "if 'encryption' is 'randomSwap' (camelCase)" do
+      let(:encryption) { "randomSwap" }
+
+      it "sets #encryption to the expected value" do
+        config = subject.convert
+        encryption = config.encryption
+        expect(encryption).to be_a(Agama::Storage::Configs::Encryption)
+        expect(encryption.method).to eq(Y2Storage::EncryptionMethod::RANDOM_SWAP)
+      end
+    end
+
+    context "if 'encryption' is 'protected_swap' (snake_case)" do
+      let(:encryption) { "protected_swap" }
+
+      it "sets #encryption to the expected value" do
+        config = subject.convert
+        encryption = config.encryption
+        expect(encryption).to be_a(Agama::Storage::Configs::Encryption)
+        expect(encryption.method).to eq(Y2Storage::EncryptionMethod::PROTECTED_SWAP)
+      end
+    end
+
+    context "if 'encryption' is 'protectedSwap' (camelCase)" do
+      let(:encryption) { "protectedSwap" }
+
+      it "sets #encryption to the expected value" do
+        config = subject.convert
+        encryption = config.encryption
+        expect(encryption).to be_a(Agama::Storage::Configs::Encryption)
+        expect(encryption.method).to eq(Y2Storage::EncryptionMethod::PROTECTED_SWAP)
+      end
+    end
+
+    context "if 'encryption' is 'secure_swap' (snake_case)" do
+      let(:encryption) { "secure_swap" }
+
+      it "sets #encryption to the expected value" do
+        config = subject.convert
+        encryption = config.encryption
+        expect(encryption).to be_a(Agama::Storage::Configs::Encryption)
+        expect(encryption.method).to eq(Y2Storage::EncryptionMethod::SECURE_SWAP)
+      end
+    end
+
+    context "if 'encryption' is 'secureSwap' (camelCase)" do
+      let(:encryption) { "secureSwap" }
+
+      it "sets #encryption to the expected value" do
+        config = subject.convert
+        encryption = config.encryption
+        expect(encryption).to be_a(Agama::Storage::Configs::Encryption)
+        expect(encryption.method).to eq(Y2Storage::EncryptionMethod::SECURE_SWAP)
+      end
+    end
   end
 end
 

web/src/openapi/config/storage.ts

@@ -43,12 +43,7 @@ export type SearchMax = number;
  * How to handle the section if the device is not found.
  */
 export type SearchActions = "skip" | "error";
-export type Encryption =
-  | EncryptionLuks1
-  | EncryptionLuks2
-  | EncryptionPervasiveLuks2
-  | EncryptionTPM
-  | EncryptionSwap;
+export type Encryption = EncryptionLuks1 | EncryptionLuks2 | EncryptionPervasiveLuks2 | EncryptionTPM | EncryptionSwap;
 /**
  * Password to use when creating a new encryption device.
  */
@@ -65,7 +60,13 @@ export type EncryptionPbkdFunction = "pbkdf2" | "argon2i" | "argon2id";
 /**
  * Swap encryptions.
  */
-export type EncryptionSwap = "protected_swap" | "secure_swap" | "random_swap";
+export type EncryptionSwap =
+  | "protected_swap"
+  | "secure_swap"
+  | "random_swap"
+  | "protectedSwap"
+  | "secureSwap"
+  | "randomSwap";
 export type FilesystemType = FilesystemTypeAny | FilesystemTypeBtrfs;
 export type FilesystemTypeAny =
   | "bcachefs"