about summary refs log tree commit diff
path: root/tvix/derivation/src/validate.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-01-17T11·00+0100
committerflokli <flokli@flokli.de>2023-01-18T17·13+0000
commiteebb3ce028e56872cdfee462dd6556e33d2f204e (patch)
tree11867d4c71985837584ae5c75e3dff949351a8a9 /tvix/derivation/src/validate.rs
parent0aad4e2246971601c16a20240eebf61964f8c198 (diff)
refactor(tvix/derivation): rename {ValidateDerivation,}Error r/5695
This is now used in more than just validate().

Change-Id: I69c3ad6cb5f3ad60a636fe2ea05d432aebe8e53b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7851
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/derivation/src/validate.rs')
-rw-r--r--tvix/derivation/src/validate.rs38
1 files changed, 15 insertions, 23 deletions
diff --git a/tvix/derivation/src/validate.rs b/tvix/derivation/src/validate.rs
index b5ba4f72ca28..65809ef5e5f3 100644
--- a/tvix/derivation/src/validate.rs
+++ b/tvix/derivation/src/validate.rs
@@ -1,13 +1,13 @@
-use crate::{derivation::Derivation, write::DOT_FILE_EXT, ValidateDerivationError};
+use crate::{derivation::Derivation, write::DOT_FILE_EXT, DerivationError};
 use tvix_store::store_path::StorePath;
 
 impl Derivation {
     /// validate ensures a Derivation struct is properly populated,
     /// and returns a [ValidateDerivationError] if not.
-    pub fn validate(&self) -> Result<(), ValidateDerivationError> {
+    pub fn validate(&self) -> Result<(), DerivationError> {
         // Ensure the number of outputs is > 1
         if self.outputs.is_empty() {
-            return Err(ValidateDerivationError::NoOutputs());
+            return Err(DerivationError::NoOutputs());
         }
 
         // Validate all outputs
@@ -22,17 +22,15 @@ impl Derivation {
             // Other output names that don't match the name restrictions from
             // [StorePath] will fail output path calculation.
             if output_name.is_empty() || output_name == "drv" {
-                return Err(ValidateDerivationError::InvalidOutputName(
-                    output_name.to_string(),
-                ));
+                return Err(DerivationError::InvalidOutputName(output_name.to_string()));
             }
 
             if output.is_fixed() {
                 if self.outputs.len() != 1 {
-                    return Err(ValidateDerivationError::MoreThanOneOutputButFixed());
+                    return Err(DerivationError::MoreThanOneOutputButFixed());
                 }
                 if output_name != "out" {
-                    return Err(ValidateDerivationError::InvalidOutputNameForFixed(
+                    return Err(DerivationError::InvalidOutputNameForFixed(
                         output_name.to_string(),
                     ));
                 }
@@ -41,7 +39,7 @@ impl Derivation {
             }
 
             if let Err(e) = output.validate() {
-                return Err(ValidateDerivationError::InvalidOutputPath(
+                return Err(DerivationError::InvalidOutputPath(
                     output_name.to_string(),
                     e,
                 ));
@@ -52,20 +50,20 @@ impl Derivation {
         for (input_derivation_path, output_names) in &self.input_derivations {
             // Validate input_derivation_path
             if let Err(e) = StorePath::from_absolute_path(input_derivation_path) {
-                return Err(ValidateDerivationError::InvalidInputDerivationPath(
+                return Err(DerivationError::InvalidInputDerivationPath(
                     input_derivation_path.to_string(),
                     e,
                 ));
             }
 
             if !input_derivation_path.ends_with(DOT_FILE_EXT) {
-                return Err(ValidateDerivationError::InvalidInputDerivationPrefix(
+                return Err(DerivationError::InvalidInputDerivationPrefix(
                     input_derivation_path.to_string(),
                 ));
             }
 
             if output_names.is_empty() {
-                return Err(ValidateDerivationError::EmptyInputDerivationOutputNames(
+                return Err(DerivationError::EmptyInputDerivationOutputNames(
                     input_derivation_path.to_string(),
                 ));
             }
@@ -82,7 +80,7 @@ impl Derivation {
                 // from [StorePath] can't be constructed with this library, but
                 // are not explicitly checked here (yet).
                 if output_name.is_empty() || output_name == "drv" {
-                    return Err(ValidateDerivationError::InvalidInputDerivationOutputName(
+                    return Err(DerivationError::InvalidInputDerivationOutputName(
                         input_derivation_path.to_string(),
                         output_name.to_string(),
                     ));
@@ -93,7 +91,7 @@ impl Derivation {
         // Validate all input_sources
         for input_source in self.input_sources.iter() {
             if let Err(e) = StorePath::from_absolute_path(input_source) {
-                return Err(ValidateDerivationError::InvalidInputSourcesPath(
+                return Err(DerivationError::InvalidInputSourcesPath(
                     input_source.to_string(),
                     e,
                 ));
@@ -102,25 +100,19 @@ impl Derivation {
 
         // validate platform
         if self.system.is_empty() {
-            return Err(ValidateDerivationError::InvalidPlatform(
-                self.system.to_string(),
-            ));
+            return Err(DerivationError::InvalidPlatform(self.system.to_string()));
         }
 
         // validate builder
         if self.builder.is_empty() {
-            return Err(ValidateDerivationError::InvalidBuilder(
-                self.builder.to_string(),
-            ));
+            return Err(DerivationError::InvalidBuilder(self.builder.to_string()));
         }
 
         // validate env, none of the keys may be empty.
         // We skip the `name` validation seen in go-nix.
         for k in self.environment.keys() {
             if k.is_empty() {
-                return Err(ValidateDerivationError::InvalidEnvironmentKey(
-                    k.to_string(),
-                ));
+                return Err(DerivationError::InvalidEnvironmentKey(k.to_string()));
             }
         }