Skip to content

Add / at the end for internal REST endpoint calls #149

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
msftrubengu merged 1 commit into from
Jun 20, 2022
Merged

Add / at the end for internal REST endpoint calls #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/WinGet.RestSource.UnitTest/Tests/RestSource/Helpers/RestSourceTriggerFunctionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
// <copyright file="RestSourceTriggerFunctionsTests.cs" company="Microsoft Corporation">
// Copyright (c) Microsoft Corporation. Licensed under the MIT License.
// </copyright>
Expand Down Expand Up @@ -56,7 +56,7 @@ public async Task GetPackageManifests_Test()

string packageIdentifier = "packageIdentifier";
var apiResponse = new ApiResponse<PackageManifest>(new PackageManifest());
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -101,7 +101,7 @@ public async Task GetPackageManifests_NoContentTest()
var restSourceTriggerFunctions = new RestSourceTriggerFunctions(AzFuncRestSourceEndpoint, AzFuncHostKey);

string packageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -141,7 +141,7 @@ public async Task GetPackageManifests_FailureStatusCodeTest()
var restSourceTriggerFunctions = new RestSourceTriggerFunctions(AzFuncRestSourceEndpoint, AzFuncHostKey);

string packageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -258,7 +258,7 @@ public async Task PutPackageManifestAsync_Test()

var packageManifest = new PackageManifest();
packageManifest.PackageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageManifest.PackageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageManifest.PackageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -297,7 +297,7 @@ public async Task PutPackageManifestAsync_FailureStatusCodeTest()

var packageManifest = new PackageManifest();
packageManifest.PackageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageManifest.PackageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageManifest.PackageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -336,7 +336,7 @@ public async Task DeletePackageManifestAsync_Test()
var restSourceTriggerFunctions = new RestSourceTriggerFunctions(AzFuncRestSourceEndpoint, AzFuncHostKey);

string packageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -374,7 +374,7 @@ public async Task DeletePackageManifestAsync_FailureStatusCodeTest()
var restSourceTriggerFunctions = new RestSourceTriggerFunctions(AzFuncRestSourceEndpoint, AzFuncHostKey);

string packageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -607,7 +607,7 @@ public async Task DeletePackageAsync_Test()
var restSourceTriggerFunctions = new RestSourceTriggerFunctions(AzFuncRestSourceEndpoint, AzFuncHostKey);

string packageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packages/{packageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packages/{packageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down Expand Up @@ -645,7 +645,7 @@ public async Task DeletePackageAsync_FailureStatusCodeTest()
var restSourceTriggerFunctions = new RestSourceTriggerFunctions(AzFuncRestSourceEndpoint, AzFuncHostKey);

string packageIdentifier = "packageIdentifier";
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packages/{packageIdentifier}");
Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packages/{packageIdentifier}/");

var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
mockHttpMessageHandler
Expand Down
8 changes: 4 additions & 4 deletions src/WinGet.RestSource/Helpers/RestSourceTriggerFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
// <copyright file="RestSourceTriggerFunctions.cs" company="Microsoft Corporation">
// Copyright (c) Microsoft Corporation. Licensed under the MIT License.
// </copyright>
Expand Down Expand Up @@ -53,12 +53,12 @@ public RestSourceTriggerFunctions(
string azFuncHostKey)
{
this.azFuncPackageManifestsEndpoint = $"{azFuncRestSourceEndpoint}{PackageManifests}";
this.azFuncPackageManifestsEndpointFormat = this.azFuncPackageManifestsEndpoint + "/{0}";
this.azFuncPackageManifestsEndpointFormat = this.azFuncPackageManifestsEndpoint + "/{0}/";

this.azFuncPackagesEndpoint = $"{azFuncRestSourceEndpoint}{Packages}";
this.azFuncPackagesEndpointFormat = this.azFuncPackagesEndpoint + "/{0}";
this.azFuncPackagesEndpointFormat = this.azFuncPackagesEndpoint + "/{0}/";

this.azFuncVersionsEndpointFormat = this.azFuncPackagesEndpointFormat + $"/{Versions}";
this.azFuncVersionsEndpointFormat = this.azFuncPackagesEndpointFormat + $"{Versions}";
this.azFuncVersionsSpecificEndpointFormat = this.azFuncVersionsEndpointFormat + "/{1}";

this.azFuncHostKey = azFuncHostKey;
Expand Down