From 541c43fca6b5eabcbd338566048e52e76bbecf79 Mon Sep 17 00:00:00 2001 From: Ruben Guerrero Samaniego Date: Mon, 20 Jun 2022 13:33:17 -0700 Subject: [PATCH] Add / at the end for REST endpoint calls --- .../RestSourceTriggerFunctionsTests.cs | 20 +++++++++---------- .../Helpers/RestSourceTriggerFunctions.cs | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/WinGet.RestSource.UnitTest/Tests/RestSource/Helpers/RestSourceTriggerFunctionsTests.cs b/src/WinGet.RestSource.UnitTest/Tests/RestSource/Helpers/RestSourceTriggerFunctionsTests.cs index 1bf213d5..f453b0fd 100644 --- a/src/WinGet.RestSource.UnitTest/Tests/RestSource/Helpers/RestSourceTriggerFunctionsTests.cs +++ b/src/WinGet.RestSource.UnitTest/Tests/RestSource/Helpers/RestSourceTriggerFunctionsTests.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) Microsoft Corporation. Licensed under the MIT License. // @@ -56,7 +56,7 @@ public async Task GetPackageManifests_Test() string packageIdentifier = "packageIdentifier"; var apiResponse = new ApiResponse(new PackageManifest()); - Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}"); + Uri expectedUri = new Uri($"{AzFuncRestSourceEndpoint}packageManifests/{packageIdentifier}/"); var mockHttpMessageHandler = new Mock(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler @@ -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(); mockHttpMessageHandler diff --git a/src/WinGet.RestSource/Helpers/RestSourceTriggerFunctions.cs b/src/WinGet.RestSource/Helpers/RestSourceTriggerFunctions.cs index 136595a7..604e0c3d 100644 --- a/src/WinGet.RestSource/Helpers/RestSourceTriggerFunctions.cs +++ b/src/WinGet.RestSource/Helpers/RestSourceTriggerFunctions.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) Microsoft Corporation. Licensed under the MIT License. // @@ -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;