From abb87b58a0292d8d6d83bf06c26c0c52585a1036 Mon Sep 17 00:00:00 2001 From: Marc Greisen Date: Tue, 15 Dec 2020 12:09:19 -0800 Subject: [PATCH] Fix integration point for tool swagger. #96 --- src/APIService/ApiService/Program.fs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/APIService/ApiService/Program.fs b/src/APIService/ApiService/Program.fs index 758fe22b..c2b14218 100644 --- a/src/APIService/ApiService/Program.fs +++ b/src/APIService/ApiService/Program.fs @@ -30,10 +30,10 @@ open Swashbuckle.AspNetCore.SwaggerGen module main = - let loadSchemaDocuments() = + let loadSchemaDocuments (settings : IConfiguration) = async { - let utilsFileShare = Environment.GetEnvironmentVariable("RAFT_UTILS_FILESHARE") - let utilsSas = Environment.GetEnvironmentVariable("RAFT_UTILS_SAS") + let utilsFileShare = settings.["RAFT_UTILS_FILESHARE"] + let utilsSas = settings.["RAFT_UTILS_SAS"] let directoryClient = Azure.Storage.Files.Shares.ShareDirectoryClient(utilsSas, utilsFileShare, "tools") @@ -102,7 +102,7 @@ module main = interface ISchemaFilter with member this.Apply(schema: OpenApiSchema, context: SchemaFilterContext): unit = if not (isNull context.MemberInfo) && - context.MemberInfo.Name = "TaskConfiguration" && + context.MemberInfo.Name = "ToolConfiguration" && context.MemberInfo.DeclaringType.Name = "RaftTask" then let schemaDocuments = getSchemaDocuments (Utilities.toolsSchemas) |> Async.RunSynchronously @@ -149,7 +149,7 @@ module main = printfn "Initializing central telemetry" ignore <| Central.Initialize (TelemetryClient(new TelemetryConfiguration(metricsKey), InstrumentationKey = metricsKey)) siteHash - Raft.Utilities.toolsSchemas <- loadSchemaDocuments () |> Async.RunSynchronously + Raft.Utilities.toolsSchemas <- loadSchemaDocuments settings |> Async.RunSynchronously Raft.Utilities.serviceStartTime <- System.DateTimeOffset.UtcNow Raft.Utilities.raftStorage <- Raft.Storage.RaftStorage(settings.[Constants.StorageTableConnectionString]) Raft.Utilities.serviceBusSenders <- Map.empty