[autofix.ci] apply automated fixes

jdx · Dec 16, 2024 · f472cee · f472cee
1 parent 7460c6b
commit f472cee
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/schema/mise.json b/schema/mise.json
@@ -294,6 +294,28 @@
           "description": "Enable experimental mise features which are incomplete or unstable—breakings changes may occur",
           "type": "boolean"
         },
+        "sops": {
+          "additionalProperties": false,
+          "properties": {
+            "rops": {
+              "default": true,
+              "description": "Use rops to decrypt sops files. Disable to shell out to `sops` which will slow down mise but sops may offer features not available in rops.",
+              "type": "boolean"
+            },
+            "age_key": {
+              "description": "The age private key to use for sops secret decryption.",
+              "type": "string"
+            },
+            "age_key_file": {
+              "description": "Path to the age private key file to use for sops secret decryption.",
+              "type": "string"
+            },
+            "age_recipients": {
+              "description": "The age public keys to use for sops secret encryption.",
+              "type": "string"
+            }
+          }
+        },
         "fetch_remote_versions_cache": {
           "default": "1h",
           "description": "How long to cache remote versions for tools.",
@@ -658,23 +680,6 @@
           "description": "Suppress all `mise run|watch` output except errors—including what tasks output.",
           "type": "boolean"
         },
-        "sops": {
-          "additionalProperties": false,
-          "properties": {
-            "age_key": {
-              "description": "The age private key to use for sops secret decryption.",
-              "type": "string"
-            },
-            "age_key_file": {
-              "description": "Path to the age private key file to use for sops secret decryption.",
-              "type": "string"
-            },
-            "age_recipients": {
-              "description": "The age public keys to use for sops secret encryption.",
-              "type": "string"
-            }
-          }
-        },
         "status": {
           "additionalProperties": false,
           "properties": {

diff --git a/settings.toml b/settings.toml
@@ -304,12 +304,6 @@ a particular feature you'd like to try. Also, if something isn't working
 right, try disabling it if you can.
 """
 
-[sops.rops]
-env = "MISE_SOPS_ROPS"
-type = "Bool"
-default = true
-description = "Use rops to decrypt sops files. Disable to shell out to `sops` which will slow down mise but sops may offer features not available in rops."
-
 [fetch_remote_versions_cache]
 env = "MISE_FETCH_REMOTE_VERSIONS_CACHE"
 type = "Duration"
@@ -885,6 +879,12 @@ type = "String"
 optional = true
 description = "The age public keys to use for sops secret encryption."
 
+[sops.rops]
+env = "MISE_SOPS_ROPS"
+type = "Bool"
+default = true
+description = "Use rops to decrypt sops files. Disable to shell out to `sops` which will slow down mise but sops may offer features not available in rops."
+
 [status.missing_tools]
 env = "MISE_STATUS_MESSAGE_MISSING_TOOLS"
 type = "String"

diff --git a/src/sops.rs b/src/sops.rs
@@ -68,7 +68,17 @@ where
     } else {
         // TODO: this won't work right if sops is coming from mise since tools won't have been loaded
         // TODO: this obviously won't work on windows
-        cmd!("sops", "--input-type", format, "--output-type", format, "-d", "/dev/stdin").stdin_bytes(input.as_bytes()).read()?
+        cmd!(
+            "sops",
+            "--input-type",
+            format,
+            "--output-type",
+            format,
+            "-d",
+            "/dev/stdin"
+        )
+        .stdin_bytes(input.as_bytes())
+        .read()?
     };
 
     if let Some(age) = prev_age {