Skip to content

bugfix/conflicting path #1504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 11, 2024
Merged

bugfix/conflicting path #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e036750
- fixes a bug where paths with multiple parameters would be considere…
baywet Dec 18, 2023
670b259
- adds additional test
baywet Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static class OpenApiPathsRules
}
});

private static readonly Regex regexPath = new Regex("\\{([^/]+)\\}", RegexOptions.Compiled, TimeSpan.FromMilliseconds(100));
private static readonly Regex regexPath = new Regex("\\{([^/}]+)\\}", RegexOptions.Compiled, TimeSpan.FromMilliseconds(100));
/// <summary>
/// A relative path to an individual endpoint. The field name MUST begin with a slash.
/// </summary>
Expand Down
33 changes: 33 additions & 0 deletions test/Microsoft.OpenApi.Tests/Validations/OpenApiPathsValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,38 @@ public void ValidatePathsAreUnique()
errors.Should().NotBeEmpty();
errors.Select(e => e.Message).Should().BeEquivalentTo(error);
}
[Fact]
public void ValidatePathsAreUniqueDoesNotConsiderMultiParametersAsIdentical()
{
// Arrange
var paths = new OpenApiPaths
{
{"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height},fittingMode='{fittingMode}')",new OpenApiPathItem() },
{"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height})",new OpenApiPathItem() },
{"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width})", new OpenApiPathItem() },
};

// Act
var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());

// Assert
errors.Should().BeEmpty();
}
[Fact]
public void ValidatePathsAreUniqueConsidersMultiParametersAsIdentical()
{
// Arrange
var paths = new OpenApiPaths
{
{"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height})",new OpenApiPathItem() },
{"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={size})",new OpenApiPathItem() },
};

// Act
var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());

// Assert
errors.Should().NotBeEmpty();
}
}
}