Skip to content

Commit 747a7f2

Browse files
committed
Validate disk parameters
1 parent 461ffd4 commit 747a7f2

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

Validation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static string StringNotEmpty([NotNull] string? property, [CallerArgumentE
3030
}
3131

3232
[return: NotNull]
33-
public static int InRange([NotNull] int? property, int? min, int? max, [CallerArgumentExpression(nameof(property))] string field = "")
33+
public static int InRange([NotNull] int? property, int? min = null, int? max = null, [CallerArgumentExpression(nameof(property))] string field = "")
3434
{
3535
NotNull(property, field);
3636

modifier/Disk.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@ public interface IInstallToSettings;
1111

1212
public class AvailableInstallToSettings : IInstallToSettings;
1313

14-
public record class CustomInstallToSettings(
15-
int InstallToDisk,
16-
int InstallToPartition
17-
) : IInstallToSettings;
14+
public class CustomInstallToSettings(
15+
int installToDisk,
16+
int installToPartition
17+
) : IInstallToSettings
18+
{
19+
public int InstallToDisk => Validation.InRange(installToDisk, min: 0);
20+
21+
public int InstallToPartition => Validation.InRange(installToPartition, min: 1);
22+
}
1823

1924
public record class CustomPartitionSettings(
2025
string Script,

modifier/PasswordExpiration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class UnlimitedPasswordExpirationSettings : IPasswordExpirationSettings;
1313

1414
public class CustomPasswordExpirationSettings(int? maxAge) : IPasswordExpirationSettings
1515
{
16-
public int MaxAge { get; } = Validation.InRange(maxAge, min: 1, max: 999);
16+
public int MaxAge => Validation.InRange(maxAge, min: 1, max: 999);
1717
}
1818

1919
class PasswordExpirationModifier(ModifierContext context) : Modifier(context)

0 commit comments

Comments
 (0)