changes based on review

Author: patelchandni

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

@@ -92,9 +92,9 @@ internal bool ArmCacheEnabled
             }
         }
 
-        public async Task<SyncTriggersResult> TrySyncTriggersAsync(bool isBackgroundSync = false)
+        public async Task<TriggersOperationResult> TrySyncTriggersAsync(bool isBackgroundSync = false)
         {
-            var result = new SyncTriggersResult
+            var result = new TriggersOperationResult
             {
                 Success = true
             };
@@ -808,12 +808,8 @@ public async Task<GetTriggersResult> GetTriggersPayloadAsync()
                 PrepareSyncTriggers();
 
                 var payload = await GetSyncTriggersPayload();
-                if (payload.Count == 0)
-                {
-                    _logger.LogDebug("No functions found in GetTriggers operation.");
-                }
 
-                result.Payload = payload;
+                result.Content = payload.Content;
                 return result;
             }
             catch (Exception ex)

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

@@ -1,25 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using static Microsoft.Azure.WebJobs.Script.WebHost.Management.FunctionsSyncManager;
-
 namespace Microsoft.Azure.WebJobs.Script.WebHost.Management
 {
-    public class GetTriggersResult
+    public class GetTriggersResult : TriggersOperationResult
     {
-        /// <summary>
-        /// Gets or sets a value indicating whether the operation was successful.
-        /// </summary>
-        public bool Success { get; set; }
-
-        /// <summary>
-        /// Gets or sets the error string in the case of a failed operation.
-        /// </summary>
-        public string Error { get; set; }
-
         /// <summary>
         /// Gets or sets the triggers payload.
         /// </summary>
-        public SyncTriggersPayload Payload { get; set; }
+        public string Content { get; set; }
     }
 }

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

@@ -11,8 +11,8 @@ public interface IFunctionsSyncManager
         /// Sync function triggers with Antares infrastructure.
         /// </summary>
         /// <param name="isBackgroundSync">Indicates whether this is a background sync operation.</param>
-        /// <returns>The <see cref="SyncTriggersResult"/> for the request.</returns>
-        Task<SyncTriggersResult> TrySyncTriggersAsync(bool isBackgroundSync = false);
+        /// <returns>The <see cref="TriggersOperationResult"/> for the request.</returns>
+        Task<TriggersOperationResult> TrySyncTriggersAsync(bool isBackgroundSync = false);
 
         /// <summary>
         /// Get function triggers payload.

src/WebJobs.Script.WebHost/Management/SyncTriggersResult.cs renamed to src/WebJobs.Script.WebHost/Management/TriggersOperationResult.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.Azure.WebJobs.Script.WebHost.Management
 {
-    public class SyncTriggersResult
+    public class TriggersOperationResult
     {
         /// <summary>
         /// Gets or sets a value indicating whether the sync operation was successful.

test/WebJobs.Script.Tests.Integration/Management/FunctionsSyncManagerTests.cs

@@ -265,9 +265,9 @@ public async Task GetTriggersPayload_ExpectedContent()
             // Assert
             Assert.True(result.Success);
             Assert.Null(result.Error);
-            Assert.NotNull(result.Payload);
+            Assert.NotNull(result.Content);
 
-            var content = JObject.Parse(result.Payload.Content);
+            var content = JObject.Parse(result.Content);
             var triggers = content["triggers"];
             Assert.Equal(GetExpectedTriggersPayload(durableVersion: "V1"), triggers.ToString(Formatting.None));
         }

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/CodelessEndToEndTests.cs

@@ -244,7 +244,7 @@ private TestFunctionHost StartLocalHost(string baseTestPath, string sourceFuncti
             string testLogPath = Path.Combine(baseTestPath, "Logs");
 
             var syncTriggerMock = new Mock<IFunctionsSyncManager>(MockBehavior.Strict);
-            syncTriggerMock.Setup(p => p.TrySyncTriggersAsync(It.IsAny<bool>())).ReturnsAsync(new SyncTriggersResult { Success = true });
+            syncTriggerMock.Setup(p => p.TrySyncTriggersAsync(It.IsAny<bool>())).ReturnsAsync(new TriggersOperationResult { Success = true });
 
             FileUtility.CopyDirectory(sourceFunctionApp, appContent);
             var host = new TestFunctionHost(sourceFunctionApp, testLogPath,

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestFixture.cs

@@ -148,7 +148,7 @@ string GetDestPath(int counter)
             }
 
             FunctionsSyncManagerMock = new Mock<IFunctionsSyncManager>(MockBehavior.Strict);
-            FunctionsSyncManagerMock.Setup(p => p.TrySyncTriggersAsync(It.IsAny<bool>())).ReturnsAsync(new SyncTriggersResult { Success = true });
+            FunctionsSyncManagerMock.Setup(p => p.TrySyncTriggersAsync(It.IsAny<bool>())).ReturnsAsync(new TriggersOperationResult { Success = true });
 
             string azuriteConnectionString = _azurite.GetConnectionString();
             Host = new TestFunctionHost(_copiedRootPath, logPath, addTestSettings: _addTestSettings,

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/MultiLanguageEndToEndTests.cs

@@ -199,7 +199,7 @@ private TestFunctionHost StartLocalHost(string baseTestPath, string sourceFuncti
             string testLogPath = Path.Combine(baseTestPath, "Logs");
 
             var syncTriggerMock = new Mock<IFunctionsSyncManager>(MockBehavior.Strict);
-            syncTriggerMock.Setup(p => p.TrySyncTriggersAsync(It.IsAny<bool>())).ReturnsAsync(new SyncTriggersResult { Success = true });
+            syncTriggerMock.Setup(p => p.TrySyncTriggersAsync(It.IsAny<bool>())).ReturnsAsync(new TriggersOperationResult { Success = true });
 
             FileUtility.CopyDirectory(sourceFunctionApp, appContent);
             var host = new TestFunctionHost(sourceFunctionApp, testLogPath,

test/WebJobs.Script.Tests/Controllers/Admin/KeysControllerTests.cs

@@ -62,7 +62,7 @@ public KeysControllerTests()
             fileBase.Setup(f => f.ReadAllText(Path.Combine(rootScriptPath, "DNE", ScriptConstants.FunctionMetadataFileName))).Throws(new DirectoryNotFoundException());
 
             _functionsSyncManagerMock = new Mock<IFunctionsSyncManager>(MockBehavior.Strict);
-            _functionsSyncManagerMock.Setup(p => p.TrySyncTriggersAsync(false)).ReturnsAsync(new SyncTriggersResult { Success = true });
+            _functionsSyncManagerMock.Setup(p => p.TrySyncTriggersAsync(false)).ReturnsAsync(new TriggersOperationResult { Success = true });
 
             var hostManagerMock = new Mock<IScriptHostManager>(MockBehavior.Strict);
             hostManagerMock.SetupGet(p => p.State).Returns(ScriptHostState.Running);

test/WebJobs.Script.Tests/FunctionsSyncServiceTests.cs

@@ -67,7 +67,7 @@ public void ShouldSyncTriggers_ReturnsExpectedResult(bool isPrimary, ScriptHostS
         public async Task StartAsync_PrimaryHost_Running_SyncsTriggers_AfterTimeout()
         {
             TaskCompletionSource syncTriggers = new TaskCompletionSource();
-            _mockSyncManager.Setup(p => p.TrySyncTriggersAsync(true)).ReturnsAsync(new SyncTriggersResult { Success = true }).Callback(() => syncTriggers.TrySetResult());
+            _mockSyncManager.Setup(p => p.TrySyncTriggersAsync(true)).ReturnsAsync(new TriggersOperationResult { Success = true }).Callback(() => syncTriggers.TrySetResult());
 
             await _syncService.StartAsync(CancellationToken.None);