Skip to content

Commit 766c6a2

Browse files
authored
Minor code cleanup in FunctionsSyncManager (#9991) (#10004)
Minor code cleanup in FunctionsSyncManager
1 parent cf8f998 commit 766c6a2

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ internal static bool IsSyncTriggersEnvironment(IScriptWebHostEnvironment webHost
227227
return true;
228228
}
229229

230-
internal async Task<string> CheckHashAsync(BlobClient hashBlobClient, string content)
230+
private async Task<string> CheckHashAsync(BlobClient hashBlobClient, string content)
231231
{
232232
try
233233
{
@@ -306,7 +306,7 @@ internal async Task<BlobClient> GetHashBlobAsync()
306306
return _hashBlobClient;
307307
}
308308

309-
public async Task<SyncTriggersPayload> GetSyncTriggersPayload()
309+
private async Task<SyncTriggersPayload> GetSyncTriggersPayload()
310310
{
311311
var hostOptions = _applicationHostOptions.CurrentValue.ToHostOptions();
312312
var functionsMetadata = _functionMetadataManager.GetFunctionMetadata().Where(m => !m.IsProxy());
@@ -344,7 +344,6 @@ public async Task<SyncTriggersPayload> GetSyncTriggersPayload()
344344
}
345345

346346
// Add all listable functions details to the payload
347-
JObject functions = new JObject();
348347
var listableFunctions = _functionMetadataManager.GetFunctionMetadata().Where(m => !m.IsCodeless());
349348
var functionDetails = await WebFunctionsManager.GetFunctionMetadataResponse(listableFunctions, hostOptions, _hostNameProvider);
350349
result.Add("functions", new JArray(functionDetails.Select(p => JObject.FromObject(p))));
@@ -468,7 +467,7 @@ internal static async Task<JObject> GetHostJsonExtensionsAsync(IOptionsMonitor<S
468467
return null;
469468
}
470469

471-
internal async Task<IEnumerable<JObject>> GetFunctionTriggers(IEnumerable<FunctionMetadata> functionsMetadata, ScriptJobHostOptions hostOptions)
470+
private async Task<IEnumerable<JObject>> GetFunctionTriggers(IEnumerable<FunctionMetadata> functionsMetadata, ScriptJobHostOptions hostOptions)
472471
{
473472
var triggers = (await functionsMetadata
474473
.Where(f => !f.IsProxy())
@@ -739,17 +738,13 @@ internal HttpRequestMessage BuildSetTriggersRequest()
739738
// of triggers. It'll verify app ownership using a SWT token valid for 5 minutes. It should be plenty.
740739
private async Task<(bool Success, string ErrorMessage)> SetTriggersAsync(string content)
741740
{
742-
string sanitizedContentString = content;
743-
if (ArmCacheEnabled)
741+
// sanitize the content before logging
742+
var sanitizedContent = JToken.Parse(content);
743+
if (sanitizedContent.Type == JTokenType.Object)
744744
{
745-
// sanitize the content before logging
746-
var sanitizedContent = JToken.Parse(content);
747-
if (sanitizedContent.Type == JTokenType.Object)
748-
{
749-
((JObject)sanitizedContent).Remove("secrets");
750-
sanitizedContentString = sanitizedContent.ToString();
751-
}
745+
((JObject)sanitizedContent).Remove("secrets");
752746
}
747+
var sanitizedContentString = Sanitizer.Sanitize(sanitizedContent.ToString());
753748

754749
using (var request = BuildSetTriggersRequest())
755750
{

0 commit comments

Comments
 (0)