From f615c6ec83d5a54f7ecd9514af37b3fa9f5a3148 Mon Sep 17 00:00:00 2001 From: Jesus Flores Date: Thu, 16 Nov 2023 14:12:44 -0600 Subject: [PATCH] Fixed multitenant tests --- .../ApiTests/GetSwaggerMetadataGenerator.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Utilities/DataLoading/EdFi.LoadTools/SmokeTest/ApiTests/GetSwaggerMetadataGenerator.cs b/Utilities/DataLoading/EdFi.LoadTools/SmokeTest/ApiTests/GetSwaggerMetadataGenerator.cs index 1318aa2bb0..8e1834e4a0 100644 --- a/Utilities/DataLoading/EdFi.LoadTools/SmokeTest/ApiTests/GetSwaggerMetadataGenerator.cs +++ b/Utilities/DataLoading/EdFi.LoadTools/SmokeTest/ApiTests/GetSwaggerMetadataGenerator.cs @@ -75,7 +75,7 @@ public async Task PerformTest() _resources[path.Key] = new Resource { Name = GetResoucePath(path.Key, path.Value), - BasePath = doc.Servers.First().Url, + BasePath = ReplaceVariablesInServer(doc.Servers.First()), Path = path.Value, Schema = GetSchemaNameFromPath(path.Key), Definition = doc.Components @@ -168,5 +168,22 @@ private static string GetSchemaNameFromPath(string path) ? GetSchemaNameParts(schemaNameParts) : string.Empty); } + + private static string ReplaceVariablesInServer(OpenApiServer server) + { + var variablesToReplace = server.Variables.Select(x => new + { + Name = x.Key, + DefaultValue = x.Value.Default.Replace("/", string.Empty) + }); + var serverUrl = server.Url; + + foreach (var variable in variablesToReplace) + { + serverUrl = serverUrl.Replace($"{{{variable.Name}}}", variable.DefaultValue); + } + + return serverUrl; + } } }