Skip to content

Fixup dependency update from commit in PR description #4079

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

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Fixup dependency update from commit in PR description #4079

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e01e05
fixup dependency update from commit in pr description
oleksandr-didyk Oct 17, 2024
c7e2c1c
fixup formatting; improve code for updating from dependencies
oleksandr-didyk Oct 22, 2024
122b408
improve comment
oleksandr-didyk Oct 22, 2024
865df07
fixup replacing from in existing update collection
oleksandr-didyk Oct 22, 2024
8b98374
minor formatting and naming improvements
oleksandr-didyk Oct 22, 2024
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
38 changes: 37 additions & 1 deletion src/Maestro/SubscriptionActorService/PullRequestActor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,8 +872,13 @@ await AddDependencyFlowEventsAsync(
MergePolicyCheckResult.PendingPolicies,
pr.Url);

// When changing `from` and `to` for depenency updates in a PR's description, we want `from` to keep
// pointing to the original version from the target branch.
var requiredDescriptionUpdates =
await ReplaceFromDependency(darcRemote, targetRepository, targetBranch, targetRepositoryUpdates);

pullRequest.Description = await _pullRequestBuilder.CalculatePRDescriptionAndCommitUpdatesAsync(
targetRepositoryUpdates.RequiredUpdates,
requiredDescriptionUpdates,
pullRequest.Description,
targetRepository,
pullRequest.HeadBranch);
Expand Down Expand Up @@ -1075,6 +1080,37 @@ private async Task<RepositoryBranchUpdate> GetRepositoryBranchUpdate()

private static string GetNewBranchName(string targetBranch) => $"darc-{targetBranch}-{Guid.NewGuid()}";

private static async Task<List<(UpdateAssetsParameters update, List<DependencyUpdate> deps)>> ReplaceFromDependency(
IRemote darcRemote,
string targetRepository,
string targetBranch,
TargetRepoDependencyUpdate targetRepositoryUpdates
)
{
List<DependencyDetail> targetBranchDeps = (await darcRemote.GetDependenciesAsync(targetRepository, targetBranch)).ToList();

//
var requiredDescriptionUpdates = targetRepositoryUpdates.RequiredUpdates
.Select(requiredUpdates =>
{
requiredUpdates.deps = requiredUpdates.deps
.Select(update =>
{
update.From = targetBranchDeps
.Where(replace => update.From.Name == replace.Name)
.FirstOrDefault(update.From);

return update;
})
.ToList();

return requiredUpdates;
})
.ToList();

return requiredDescriptionUpdates;
}

#region Code flow subscriptions

/// <summary>
Expand Down
38 changes: 37 additions & 1 deletion ...roductConstructionService/ProductConstructionService.DependencyFlow/PullRequestUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,13 @@ await AddDependencyFlowEventsAsync(
MergePolicyCheckResult.PendingPolicies,
pr.Url);

// When changing `from` and `to` for depenency updates in a PR's description, we want `from` to keep
// pointing to the original version from the target branch.
var requiredDescriptionUpdates =
await ReplaceFromDependency(darcRemote, targetRepository, targetBranch, targetRepositoryUpdates);

pullRequest.Description = await _pullRequestBuilder.CalculatePRDescriptionAndCommitUpdatesAsync(
targetRepositoryUpdates.RequiredUpdates,
requiredDescriptionUpdates,
pullRequest.Description,
targetRepository,
pullRequest.HeadBranch);
Expand Down Expand Up @@ -836,6 +841,37 @@ private async Task ClearAllStateAsync()
await _pullRequestUpdateReminders.UnsetReminderAsync();
}

private static async Task<List<(SubscriptionUpdateWorkItem update, List<DependencyUpdate> deps)>> ReplaceFromDependency(
IRemote darcRemote,
string targetRepository,
string targetBranch,
TargetRepoDependencyUpdate targetRepositoryUpdates
)
{
List<DependencyDetail> targetBranchDeps = (await darcRemote.GetDependenciesAsync(targetRepository, targetBranch)).ToList();

//
var requiredDescriptionUpdates = targetRepositoryUpdates.RequiredUpdates
.Select(requiredUpdates =>
{
requiredUpdates.deps = requiredUpdates.deps
.Select(update =>
{
update.From = targetBranchDeps
.Where(replace => update.From.Name == replace.Name)
.FirstOrDefault(update.From);

return update;
})
.ToList();

return requiredUpdates;
})
.ToList();

return requiredDescriptionUpdates;
}

#region Code flow subscriptions

/// <summary>
Expand Down
9 changes: 6 additions & 3 deletions test/Maestro.ScenarioTests/MaestroScenarioTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void SetTestParameters(TestParameters parameters)
if (!string.IsNullOrEmpty(_parameters.MaestroToken))
{
_baseDarcRunArgs.AddRange(["-p", _parameters.MaestroToken]);
}
}
}

protected async Task<Octokit.PullRequest> WaitForPullRequestAsync(string targetRepo, string targetBranch)
Expand Down Expand Up @@ -487,7 +487,10 @@ protected async Task AddDependenciesToLocalRepo(string repoPath, string name, st
{
using (ChangeDirectory(repoPath))
{
await RunDarcAsync(["add-dependency", "--name", name, "--type", isToolset ? "toolset" : "product", "--repo", repoUri, "--version", "0.0.1"]);
await RunDarcAsync(
[
"add-dependency", "--name", name, "--version", "0.0.1", "--type", isToolset ? "toolset" : "product", "--repo", repoUri
]);
}
}
protected async Task<string> GetTestChannelsAsync()
Expand Down Expand Up @@ -682,7 +685,7 @@ protected async Task AddDependenciesToLocalRepo(string repoPath, List<AssetData>

protected async Task<string> GatherDrop(int buildId, string outputDir, bool includeReleased, string extraAssetsRegex)
{
string[] args = [ "gather-drop", "--id", buildId.ToString(), "--dry-run", "--output-dir", outputDir ];
string[] args = ["gather-drop", "--id", buildId.ToString(), "--dry-run", "--output-dir", outputDir];

if (includeReleased)
{
Expand Down
5 changes: 4 additions & 1 deletion test/ProductConstructionService.ScenarioTests/ScenarioTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,10 @@ protected async Task AddDependenciesToLocalRepo(string repoPath, List<AssetData>
{
foreach (AssetData asset in dependencies)
{
List<string> parameters = ["add-dependency", "--name", asset.Name, "--type", "product", "--repo", repoUri];
List<string> parameters =
[
"add-dependency", "--name", asset.Name,"--type", "product", "--repo", repoUri,
];

if (!string.IsNullOrEmpty(coherentParent))
{
Expand Down