Skip to content

Add find parent work item to azsdk cli #13681

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
jeo02 merged 8 commits into from
Jan 28, 2026
+88 −6
Merged

Add find parent work item to azsdk cli #13681

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
849bbf1
find parent work item
jeo02 Jan 21, 2026
292375d
Add in Find or create service parent
jeo02 Jan 21, 2026
be5d6ed
spelling fix for const
jeo02 Jan 21, 2026
7f85a90
nullable work item
jeo02 Jan 21, 2026
823bdd8
split findparentworkitem
jeo02 Jan 27, 2026
660a400
Merge branch 'main' into find-parent-work-item
jeo02 Jan 27, 2026
2eb68b3
quick fix
jeo02 Jan 27, 2026
39da82a
fixes
jeo02 Jan 27, 2026
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
94 changes: 88 additions & 6 deletions tools/azsdk-cli/Azure.Sdk.Tools.Cli/Services/DevOpsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public interface IDevOpsService

public partial class DevOpsService(ILogger<DevOpsService> logger, IDevOpsConnection connection) : IDevOpsService
{
private static readonly string RELEASE_PLANER_APP_TEST = "Release Planner App Test";
private static readonly string RELEASE_PLANNER_APP_TEST = "Release Planner App Test";
private List<WorkItemRelationType>? _cachedRelationTypes;

private static readonly string[] SUPPORTED_SDK_LANGUAGES = { "Dotnet", "JavaScript", "Python", "Java", "Go" };
Expand All @@ -128,7 +128,7 @@ public async Task<List<ReleasePlanWorkItem>> ListOverdueReleasePlansAsync()
try
{
var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}'";
query += $" AND [System.Tags] NOT CONTAINS '{RELEASE_PLANER_APP_TEST}'";
query += $" AND [System.Tags] NOT CONTAINS '{RELEASE_PLANNER_APP_TEST}'";
query += " AND [System.WorkItemType] = 'Release Plan'";
query += " AND [System.State] IN ('In Progress','Not Started','New')";
query += " AND [Custom.SDKReleasemonth] <> ''";
Expand Down Expand Up @@ -186,7 +186,7 @@ public async Task<List<ReleasePlanWorkItem>> GetReleasePlansForProductAsync(stri
try
{
var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}'";
query += $" AND [System.Tags] {(isTestReleasePlan ? "CONTAINS" : "NOT CONTAINS")} '{RELEASE_PLANER_APP_TEST}'";
query += $" AND [System.Tags] {(isTestReleasePlan ? "CONTAINS" : "NOT CONTAINS")} '{RELEASE_PLANNER_APP_TEST}'";
query += $" AND [Custom.ProductServiceTreeID] = '{productTreeId}'";
query += $" AND [Custom.SDKtypetobereleased] = '{sdkReleaseType}'";
query += " AND [System.WorkItemType] = 'Release Plan'";
Expand Down Expand Up @@ -225,7 +225,7 @@ public async Task<List<ReleasePlanWorkItem>> GetReleasePlansForPackageAsync(stri
var languageId = MapLanguageToId(language);
var escapedPackageName = packageName?.Replace("'", "''");
var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}'";
query += $" AND [System.Tags] {(isTestReleasePlan ? "CONTAINS" : "NOT CONTAINS")} '{RELEASE_PLANER_APP_TEST}'";
query += $" AND [System.Tags] {(isTestReleasePlan ? "CONTAINS" : "NOT CONTAINS")} '{RELEASE_PLANNER_APP_TEST}'";
query += $" AND [Custom.{languageId}PackageName] = '{escapedPackageName}'";
query += " AND [System.WorkItemType] = 'Release Plan'";
query += " AND [System.State] = 'In Progress'";
Expand Down Expand Up @@ -1164,7 +1164,7 @@ public async Task<PackageWorkitemResponse> GetPackageWorkItemAsync(string packag
throw new ArgumentException("Invalid data in one of the parameters.");
}

var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.Package] = '{packageName}' AND [Custom.Language] = '{language}' AND [System.WorkItemType] = 'Package' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned') AND [System.Tags] NOT CONTAINS '{RELEASE_PLANER_APP_TEST}'";
var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.Package] = '{packageName}' AND [Custom.Language] = '{language}' AND [System.WorkItemType] = 'Package' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned') AND [System.Tags] NOT CONTAINS '{RELEASE_PLANNER_APP_TEST}'";
if (!string.IsNullOrEmpty(packageVersion))
{
query += $" AND [Custom.PackageVersion] = '{packageVersion}'";
Expand All @@ -1191,7 +1191,7 @@ public async Task<List<PackageWorkitemResponse>> ListPartialPackageWorkItemAsync
throw new ArgumentException("Invalid data in one of the parameters.");
}

var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.Package] CONTAINS '{packageName}' AND [Custom.Language] = '{language}' AND [System.WorkItemType] = 'Package' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned') AND [System.Tags] NOT CONTAINS '{RELEASE_PLANER_APP_TEST}'";
var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.Package] CONTAINS '{packageName}' AND [Custom.Language] = '{language}' AND [System.WorkItemType] = 'Package' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned') AND [System.Tags] NOT CONTAINS '{RELEASE_PLANNER_APP_TEST}'";
query += " ORDER BY [System.Id] DESC"; // Order by package work item to find the most recently created

logger.LogInformation("Fetching package work item with package name {packageName} and language {language}.", packageName, language);
Expand Down Expand Up @@ -1411,6 +1411,88 @@ public async Task<WorkItem> UpdateWorkItemAsync(int workItemId, Dictionary<strin
return workItem;
}

private async Task<WorkItem> FindOrCreateServiceParent(string serviceName, bool ignoreReleasePlannerTests = true, string? tag = null)
{
var serviceParent = await FindServiceWorkItem(serviceName, ignoreReleasePlannerTests, tag);
if (serviceParent != null)
{
logger.LogDebug("Found existing service work item [{workItemId}]", serviceParent.Id);
return serviceParent;
}

var serviceWorkItem = new EpicWorkItem
{
ServiceName = serviceName,
EpicType = "Service"
};

if (!string.IsNullOrEmpty(tag))
{
serviceWorkItem.Tag = tag;
}

var workItem = await CreateWorkItemAsync(serviceWorkItem, "Epic", serviceName);

logger.LogInformation("[{workItemId}] - Created service work item for {serviceName}", workItem.Id, serviceName);
return workItem;
}

private async Task<WorkItem?> FindEpicWorkItem(string serviceName, string? packageDisplayName = null, bool ignoreReleasePlannerTests = true, string? tag = null)
{
var serviceCondition = new StringBuilder();

if (!string.IsNullOrEmpty(serviceName))
{
serviceCondition.Append($"[Custom.ServiceName] = '{serviceName}'");

if (!string.IsNullOrEmpty(packageDisplayName))
{
serviceCondition.Append($" AND [Custom.PackageDisplayName] = '{packageDisplayName}'");
}
else
{
serviceCondition.Append(" AND [Custom.PackageDisplayName] = ''");
}
}
else
{
serviceCondition.Append("[Custom.ServiceName] <> ''");
}

if (!string.IsNullOrEmpty(tag))
{
serviceCondition.Append($" AND [System.Tags] CONTAINS '{tag}'");
}

if (ignoreReleasePlannerTests)
{
serviceCondition.Append($" AND [System.Tags] NOT CONTAINS '{RELEASE_PLANNER_APP_TEST}'");
}

var query = $"SELECT [System.Id], [Custom.ServiceName], [Custom.PackageDisplayName], [System.Parent], [System.Tags] FROM WorkItems WHERE [System.State] <> 'Duplicate' AND [System.WorkItemType] = 'Epic' AND {serviceCondition}";

logger.LogDebug("Finding parent work item with query: {query}", query);

var workItems = await FetchWorkItemsAsync(query);

if (workItems.Count > 0)
{
if (workItems.Count > 1)
{
logger.LogWarning("Found multiple parent work items matching criteria. Using first match with ID: {workItemId}", workItems[0].Id);
}
return workItems[0];
}

return null;
}

private async Task<WorkItem?> FindProductWorkItem(string serviceName, string packageDisplayName, bool ignoreReleasePlannerTests = true, string? tag = null)
=> await FindEpicWorkItem(serviceName, packageDisplayName, ignoreReleasePlannerTests, tag);

private async Task<WorkItem?> FindServiceWorkItem(string serviceName, bool ignoreReleasePlannerTests = true, string? tag = null)
=> await FindEpicWorkItem(serviceName, null, ignoreReleasePlannerTests, tag);

private async Task UpdateWorkItemParentAsync(WorkItemBase child, WorkItemBase parent)
{
if (child.ParentId == parent.WorkItemId)
Expand Down