Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass jobId to the actionsDownloadInfo controller #1639

Merged
merged 17 commits into from
Feb 9, 2022
Merged

Pass jobId to the actionsDownloadInfo controller #1639

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b665c94
Update JobServer.cs
BALAGA-GAYATRI Jan 26, 2022
18aeaff
Update ActionManager.cs
BALAGA-GAYATRI Jan 26, 2022
7de5b62
Update TaskHttpClientBase.cs
BALAGA-GAYATRI Jan 26, 2022
8c68845
Update ActionManagerL0.cs
BALAGA-GAYATRI Jan 26, 2022
3d8b6ca
Update ActionManager.cs
BALAGA-GAYATRI Jan 28, 2022
e184738
:nit changes
BALAGA-GAYATRI Jan 28, 2022
aa4136a
Update ActionManager.cs
BALAGA-GAYATRI Jan 28, 2022
ab060ae
:nit changes
BALAGA-GAYATRI Jan 28, 2022
3241345
Code formatting
BALAGA-GAYATRI Jan 28, 2022
90ba91e
Update JobServer.cs
BALAGA-GAYATRI Jan 28, 2022
59abf9b
Update JobServer.cs
BALAGA-GAYATRI Jan 28, 2022
b7e71ec
Update TaskHttpClientBase.cs
BALAGA-GAYATRI Jan 28, 2022
bf72ff0
Update ActionManagerL0.cs
BALAGA-GAYATRI Feb 4, 2022
9b354f4
:nit changes
BALAGA-GAYATRI Feb 4, 2022
64063a4
passing `jobId` as queryparameter to the controller
BALAGA-GAYATRI Feb 4, 2022
ebe964c
:nit changes
BALAGA-GAYATRI Feb 4, 2022
9570aa6
Update src/Sdk/DTGenerated/Generated/TaskHttpClientBase.cs
TingluoHuang Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Runner.Common/JobServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using GitHub.DistributedTask.WebApi;
using GitHub.DistributedTask.WebApi;
using System;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -26,7 +26,7 @@ public interface IJobServer : IRunnerService
Task<List<TimelineRecord>> UpdateTimelineRecordsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, IEnumerable<TimelineRecord> records, CancellationToken cancellationToken);
Task RaisePlanEventAsync<T>(Guid scopeIdentifier, string hubName, Guid planId, T eventData, CancellationToken cancellationToken) where T : JobEvent;
Task<Timeline> GetTimelineAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, CancellationToken cancellationToken);
Task<ActionDownloadInfoCollection> ResolveActionDownloadInfoAsync(Guid scopeIdentifier, string hubName, Guid planId, ActionReferenceList actions, CancellationToken cancellationToken);
Task<ActionDownloadInfoCollection> ResolveActionDownloadInfoAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken);
}

public sealed class JobServer : RunnerService, IJobServer
Expand All @@ -42,7 +42,7 @@ public async Task ConnectAsync(VssConnection jobConnection)
int attemptCount = totalAttempts;
var configurationStore = HostContext.GetService<IConfigurationStore>();
var runnerSettings = configurationStore.GetSettings();

while (!_connection.HasAuthenticated && attemptCount-- > 0)
{
try
Expand Down Expand Up @@ -186,10 +186,10 @@ public Task<Timeline> GetTimelineAsync(Guid scopeIdentifier, string hubName, Gui
//-----------------------------------------------------------------
// Action download info
//-----------------------------------------------------------------
public Task<ActionDownloadInfoCollection> ResolveActionDownloadInfoAsync(Guid scopeIdentifier, string hubName, Guid planId, ActionReferenceList actions, CancellationToken cancellationToken)
public Task<ActionDownloadInfoCollection> ResolveActionDownloadInfoAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken)
{
CheckConnection();
return _taskClient.ResolveActionDownloadInfoAsync(scopeIdentifier, hubName, planId, actions, cancellationToken: cancellationToken);
return _taskClient.ResolveActionDownloadInfoAsync(scopeIdentifier, hubName, planId, jobId, actions, cancellationToken: cancellationToken);
}
}
}
2 changes: 1 addition & 1 deletion src/Runner.Worker/ActionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ private async Task BuildActionContainerAsync(IExecutionContext executionContext,
{
try
{
actionDownloadInfos = await jobServer.ResolveActionDownloadInfoAsync(executionContext.Global.Plan.ScopeIdentifier, executionContext.Global.Plan.PlanType, executionContext.Global.Plan.PlanId, new WebApi.ActionReferenceList { Actions = actionReferences }, executionContext.CancellationToken);
actionDownloadInfos = await jobServer.ResolveActionDownloadInfoAsync(executionContext.Global.Plan.ScopeIdentifier, executionContext.Global.Plan.PlanType, executionContext.Global.Plan.PlanId, executionContext.Root.Id, new WebApi.ActionReferenceList { Actions = actionReferences }, executionContext.CancellationToken);
break;
}
catch (Exception ex) when (!executionContext.CancellationToken.IsCancellationRequested) // Do not retry if the run is canceled.
Expand Down
6 changes: 4 additions & 2 deletions src/Sdk/DTGenerated/Generated/TaskHttpClientBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* ---------------------------------------------------------
* Copyright(C) Microsoft Corporation. All rights reserved.
* ---------------------------------------------------------
Expand Down Expand Up @@ -324,20 +324,22 @@ public virtual Task<Timeline> GetTimelineAsync(
/// <param name="scopeIdentifier">The project GUID to scope the request</param>
/// <param name="hubName">The name of the server hub: "build" for the Build server or "rm" for the Release Management server</param>
/// <param name="planId"></param>
/// <param name="jobId"></param>
/// <param name="actionReferenceList"></param>
/// <param name="userState"></param>
/// <param name="cancellationToken">The cancellation token to cancel operation.</param>
public virtual Task<ActionDownloadInfoCollection> ResolveActionDownloadInfoAsync(
Guid scopeIdentifier,
string hubName,
Guid planId,
Guid jobId,
ActionReferenceList actionReferenceList,
object userState = null,
CancellationToken cancellationToken = default)
{
HttpMethod httpMethod = new HttpMethod("POST");
Guid locationId = new Guid("27d7f831-88c1-4719-8ca1-6a061dad90eb");
object routeValues = new { scopeIdentifier = scopeIdentifier, hubName = hubName, planId = planId };
object routeValues = new { scopeIdentifier = scopeIdentifier, hubName = hubName, planId = planId, jobId = jobId };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will this new route without versioning break compat between the latest runner and old GHES.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is a query parameter change without route value , would it still break the compat and do we need GHES testing in that case?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest you always test GHES with any REST API changes.

HttpContent content = new ObjectContent<ActionReferenceList>(actionReferenceList, new VssJsonMediaTypeFormatter(true));

return SendAsync<ActionDownloadInfoCollection>(
Expand Down
6 changes: 3 additions & 3 deletions src/Test/L0/Worker/ActionManagerL0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
Expand Down Expand Up @@ -2156,8 +2156,8 @@ private void Setup([CallerMemberName] string name = "", bool enableComposite = t
_dockerManager.Setup(x => x.DockerBuild(_ec.Object, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(Task.FromResult(0));

_jobServer = new Mock<IJobServer>();
_jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
.Returns((Guid scopeIdentifier, string hubName, Guid planId, ActionReferenceList actions, CancellationToken cancellationToken) =>
_jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
.Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
{
var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
foreach (var action in actions.Actions)
Expand Down