Move constant values to static class

benbp · benbp · commit a2811b6e1e62 · 2025-07-11T17:38:09.000-04:00
diff --git a/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Configuration/Constants.cs b/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Configuration/Constants.cs
@@ -0,0 +1,12 @@
+namespace Azure.Sdk.Tools.Cli.Configuration;
+
+public static class Constants
+{
+    public const string AZURE_DEVOPS_TOKEN_SCOPE = "499b84ac-1321-427f-aa17-267ca6975798/.default";
+    public const string MICROSOFT_CORP_TENANT = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+
+    public const string AZURE_SDK_DEVOPS_BASE_URL = "https://dev.azure.com/azure-sdk";
+    public const string AZURE_SDK_DEVOPS_PUBLIC_PROJECT = "public";
+    public const string AZURE_SDK_DEVOPS_INTERNAL_PROJECT = "internal";
+    public const string AZURE_SDK_DEVOPS_RELEASE_PROJECT = "release";
+}
diff --git a/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Services/DevOpsService.cs b/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Services/DevOpsService.cs
@@ -12,6 +12,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using Azure.Sdk.Tools.Cli.Configuration;
 using Azure.Sdk.Tools.Cli.Models;
 using Azure.Sdk.Tools.Cli.Models.Responses;
 
@@ -30,7 +31,6 @@ public class DevOpsConnection : IDevOpsConnection
         private WorkItemTrackingHttpClient _workItemClient;
         private ProjectHttpClient _projectClient;
         private AccessToken? _token;
-        private static readonly string DEVOPS_SCOPE = "499b84ac-1321-427f-aa17-267ca6975798/.default";
 
         private void RefreshConnection()
         {
@@ -39,11 +39,11 @@ private void RefreshConnection()
 
             try
             {
-                _token = (new DefaultAzureCredential()).GetToken(new TokenRequestContext([DEVOPS_SCOPE]));
+                _token = (new DefaultAzureCredential()).GetToken(new TokenRequestContext([Constants.AZURE_DEVOPS_TOKEN_SCOPE]));
             }
             catch
             {
-                _token = (new InteractiveBrowserCredential()).GetToken(new TokenRequestContext([DEVOPS_SCOPE]));
+                _token = (new InteractiveBrowserCredential()).GetToken(new TokenRequestContext([Constants.AZURE_DEVOPS_TOKEN_SCOPE]));
             }
 
             if (_token == null)
@@ -52,7 +52,7 @@ private void RefreshConnection()
 
             try
             {
-                var connection = new VssConnection(new Uri(DevOpsService.DEVOPS_URL), new VssOAuthAccessTokenCredential(_token?.Token));
+                var connection = new VssConnection(new Uri(Constants.AZURE_SDK_DEVOPS_BASE_URL), new VssOAuthAccessTokenCredential(_token?.Token));
                 _buildClient = connection.GetClient<BuildHttpClient>();
                 _workItemClient = connection.GetClient<WorkItemTrackingHttpClient>();
                 _projectClient = connection.GetClient<ProjectHttpClient>();
@@ -103,13 +103,8 @@ public interface IDevOpsService
 
     public partial class DevOpsService(ILogger<DevOpsService> logger, IDevOpsConnection connection) : IDevOpsService
     {
-        public static readonly string DEVOPS_URL = "https://dev.azure.com/azure-sdk";
-        public static readonly string RELEASE_PROJECT = "release";
-        public static readonly string INTERNAL_PROJECT = "internal";
         private static readonly string RELEASE_PLANER_APP_TEST = "Release Planner App Test";
 
-        private const string PUBLIC_PROJECT = "public";
-
         [GeneratedRegex("\\|\\s(Beta|Stable|GA)\\s\\|\\s([\\S]+)\\s\\|\\s([\\S]+)\\s\\|")]
         private static partial Regex SdkReleaseDetailsRegex();
 
@@ -128,7 +123,7 @@ public async Task<ReleasePlan> GetReleasePlanForWorkItemAsync(int workItemId)
         public async Task<ReleasePlan> GetReleasePlanAsync(int releasePlanId)
         {
             // First find the API spec work item
-            var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{RELEASE_PROJECT}' AND [Custom.ReleasePlanID] = '{releasePlanId}' AND [System.WorkItemType] = 'Release Plan' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";
+            var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.ReleasePlanID] = '{releasePlanId}' AND [System.WorkItemType] = 'Release Plan' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";
             var releasePlanWorkItems = await FetchWorkItemsAsync(query);
             if (releasePlanWorkItems.Count == 0)
             {
@@ -209,7 +204,7 @@ public async Task<ReleasePlan> GetReleasePlanAsync(string pullRequestUrl)
             // First find the API spec work item
             try
             {
-                var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{RELEASE_PROJECT}' AND [Custom.RESTAPIReviews] CONTAINS WORDS '{pullRequestUrl}' AND [System.WorkItemType] = 'API Spec' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";
+                var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.RESTAPIReviews] CONTAINS WORDS '{pullRequestUrl}' AND [System.WorkItemType] = 'API Spec' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";
                 var apiSpecWorkItems = await FetchWorkItemsAsync(query);
                 if (apiSpecWorkItems.Count == 0)
                 {
@@ -335,7 +330,7 @@ private async Task<WorkItem> CreateWorkItemAsync(ReleasePlan releasePlan, string
 
             logger.LogInformation($"Creating {workItemType} work item");
             logger.LogInformation($"Request data to DeVops: {JsonSerializer.Serialize(specDocument)}");
-            var workItem = await connection.GetWorkItemClient().CreateWorkItemAsync(specDocument, RELEASE_PROJECT, workItemType);
+            var workItem = await connection.GetWorkItemClient().CreateWorkItemAsync(specDocument, Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT, workItemType);
             if (workItem == null)
             {
                 throw new Exception("Failed to create Work Item");
@@ -536,8 +531,8 @@ public async Task<Build> RunPipelineAsync(int pipelineDefinitionId, Dictionary<s
 
             var buildClient = connection.GetBuildClient();
             var projectClient = connection.GetProjectClient();
-            var definition = await buildClient.GetDefinitionAsync(INTERNAL_PROJECT, pipelineDefinitionId);
-            var project = await projectClient.GetProject(INTERNAL_PROJECT);
+            var definition = await buildClient.GetDefinitionAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, pipelineDefinitionId);
+            var project = await projectClient.GetProject(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT);
 
             // Queue SDK generation pipeline
             logger.LogInformation($"Queueing pipeline [{definition.Name}].");
@@ -555,13 +550,13 @@ public async Task<Build> RunPipelineAsync(int pipelineDefinitionId, Dictionary<s
         public async Task<Build> GetPipelineRunAsync(int buildId)
         {
             var buildClient = connection.GetBuildClient();
-            return await buildClient.GetBuildAsync(INTERNAL_PROJECT, buildId);
+            return await buildClient.GetBuildAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId);
         }
 
         public async Task<string> GetSDKPullRequestFromPipelineRunAsync(int buildId, string language, int workItemId)
         {
             var buildClient = connection.GetBuildClient();
-            var timeLine = await buildClient.GetBuildTimelineAsync(INTERNAL_PROJECT, buildId);
+            var timeLine = await buildClient.GetBuildTimelineAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId);
             var createPrJob = timeLine.Records.FirstOrDefault(r => r.Name == "Create pull request") ?? null;
             if (createPrJob == null)
             {
@@ -571,7 +566,7 @@ public async Task<string> GetSDKPullRequestFromPipelineRunAsync(int buildId, str
             // Get SDK pull request from create pull request job attachment
             if (createPrJob.Result == TaskResult.Succeeded)
             {
-                var contentStream = await buildClient.GetAttachmentAsync(INTERNAL_PROJECT, buildId, timeLine.Id, createPrJob.Id, "Distributedtask.Core.Summary", "Pull Request Created");
+                var contentStream = await buildClient.GetAttachmentAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId, timeLine.Id, createPrJob.Id, "Distributedtask.Core.Summary", "Pull Request Created");
                 if (contentStream != null)
                 {
                     var content = new StreamReader(contentStream);
@@ -599,7 +594,7 @@ public async Task<string> GetSDKPullRequestFromPipelineRunAsync(int buildId, str
 
         public static string GetPipelineUrl(int buildId)
         {
-            return $"https://dev.azure.com/azure-sdk/internal/_build/results?buildId={buildId}";
+            return $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/internal/_build/results?buildId={buildId}";
         }
 
         public static string ParseSDKPullRequestUrl(string sdkGenerationSummary)
@@ -847,7 +842,7 @@ public async Task<PackageResponse> GetPackageWorkItemAsync(string packageName, s
                 throw new ArgumentException("Invalid data in one of the parameters.");
             }
 
-            var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{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_PLANER_APP_TEST}'";
             if (!string.IsNullOrEmpty(packageVersion))
             {
                 query += $" AND [Custom.PackageVersion] = '{packageVersion}'";
@@ -960,7 +955,7 @@ private async Task<Dictionary<string, List<string>>> GetLlmArtifactsUnauthentica
         {
             var result = new Dictionary<string, List<string>>();
             using var httpClient = new HttpClient();
-            var artifactsUrl = $"https://dev.azure.com/azure-sdk/{project}/_apis/build/builds/{buildId}/artifacts?api-version=7.1-preview.5";
+            var artifactsUrl = $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}/artifacts?api-version=7.1-preview.5";
             var artifactsResponse = await httpClient.GetAsync(artifactsUrl);
             artifactsResponse.EnsureSuccessStatusCode();
             var artifactsJson = await artifactsResponse.Content.ReadAsStringAsync();
@@ -1045,7 +1040,7 @@ await Task.Factory.StartNew(() =>
 
         public async Task<Dictionary<string, List<string>>> GetPipelineLlmArtifacts(string project, int buildId)
         {
-            if (project == PUBLIC_PROJECT)
+            if (project == Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT)
             {
                 return await GetLlmArtifactsUnauthenticated(project, buildId);
             }
diff --git a/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Tools/AzurePipelines/PipelineAnalysisTool.cs b/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Tools/AzurePipelines/PipelineAnalysisTool.cs
@@ -8,6 +8,7 @@
 using System.Xml;
 using Azure.Core;
 using Azure.Sdk.Tools.Cli.Commands;
+using Azure.Sdk.Tools.Cli.Configuration;
 using Azure.Sdk.Tools.Cli.Contract;
 using Azure.Sdk.Tools.Cli.Helpers;
 using Azure.Sdk.Tools.Cli.Models;
@@ -32,12 +33,6 @@ public class PipelineAnalysisTool : MCPTool
     private readonly IOutputService output;
     private readonly ILogger<PipelineAnalysisTool> logger;
 
-    private const string AZURE_DEVOPS_TOKEN_SCOPE = "499b84ac-1321-427f-aa17-267ca6975798/.default";
-    private const string MICROSOFT_CORP_TENANT = "72f988bf-86f1-41af-91ab-2d7cd011db47";
-    private const string AZURE_DEVOPS_BASE_URL = "https://dev.azure.com/azure-sdk";
-    private const string PUBLIC_PROJECT = "public";
-    private const string INTERNAL_PROJECT = "internal";
-
     private IAzureAgentService azureAgentService;
     private TokenUsageHelper usage;
     private bool initialized = false;
@@ -142,17 +137,16 @@ private void Initialize(bool auth = true)
 
         if (auth)
         {
-            var tokenScope = new[] { AZURE_DEVOPS_TOKEN_SCOPE };
-            var msftCorpTenant = MICROSOFT_CORP_TENANT;
-            var token = azureService.GetCredential(msftCorpTenant).GetToken(new TokenRequestContext(tokenScope));
+            var tokenScope = new[] { Constants.AZURE_DEVOPS_TOKEN_SCOPE };
+            var token = azureService.GetCredential(Constants.MICROSOFT_CORP_TENANT).GetToken(new TokenRequestContext(tokenScope));
             var tokenCredential = new VssOAuthAccessTokenCredential(token.Token);
-            var connection = new VssConnection(new Uri(AZURE_DEVOPS_BASE_URL), tokenCredential);
+            var connection = new VssConnection(new Uri(Constants.AZURE_SDK_DEVOPS_BASE_URL), tokenCredential);
             _buildClient = connection.GetClient<BuildHttpClient>();
             _testClient = connection.GetClient<TestResultsHttpClient>();
         }
         else
         {
-            var connection = new VssConnection(new Uri(AZURE_DEVOPS_BASE_URL), null);
+            var connection = new VssConnection(new Uri(Constants.AZURE_SDK_DEVOPS_BASE_URL), null);
             _buildClient = connection.GetClient<BuildHttpClient>();
             _testClient = connection.GetClient<TestResultsHttpClient>();
         }
@@ -162,15 +156,15 @@ private void Initialize(bool auth = true)
 
     private async Task<string> GetPipelineProject(int buildId, string? project = null)
     {
-        if (project == PUBLIC_PROJECT || string.IsNullOrEmpty(project))
+        if (project == Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT || string.IsNullOrEmpty(project))
         {
-            var pipelineUrl = $"{AZURE_DEVOPS_BASE_URL}/{PUBLIC_PROJECT}/_apis/build/builds/{buildId}?api-version=7.1";
+            var pipelineUrl = $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/{Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT}/_apis/build/builds/{buildId}?api-version=7.1";
             logger.LogDebug("Getting pipeline details from {url} via http", pipelineUrl);
             var response = await httpClient.GetAsync(pipelineUrl);
             // If project is not specified, try both public and internal projects
             if (string.IsNullOrEmpty(project) && !response.IsSuccessStatusCode)
             {
-                return await GetPipelineProject(buildId, INTERNAL_PROJECT);
+                return await GetPipelineProject(buildId, Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT);
             }
             response.EnsureSuccessStatusCode();
             var json = await response.Content.ReadAsStringAsync();
@@ -183,7 +177,7 @@ private async Task<string> GetPipelineProject(int buildId, string? project = nul
             return projectName;
         }
 
-        var _pipelineUrl = $"{AZURE_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}?api-version=7.1";
+        var _pipelineUrl = $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}?api-version=7.1";
         logger.LogDebug("Getting pipeline details from {url} via sdk", _pipelineUrl);
         var build = await buildClient.GetBuildAsync(project, buildId);
         return build.Project.Name;
@@ -193,7 +187,7 @@ public async Task<List<int>> GetPipelineFailureLogIds(string project, int buildI
     {
         logger.LogDebug("Getting pipeline task failures for {project} {buildId}", project, buildId);
 
-        if (project != PUBLIC_PROJECT)
+        if (project != Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT)
         {
             var timeline = await buildClient.GetBuildTimelineAsync(project, buildId, cancellationToken: ct);
             var _failedTasks = timeline.Records.Where(
@@ -205,7 +199,7 @@ public async Task<List<int>> GetPipelineFailureLogIds(string project, int buildI
             return _failedTasks.Select(t => t.Log?.Id ?? 0).Where(id => id != 0).Distinct().ToList();
         }
 
-        var timelineUrl = $"{AZURE_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}/timeline?api-version=7.1";
+        var timelineUrl = $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}/timeline?api-version=7.1";
         logger.LogDebug("Getting timeline records from {url}", timelineUrl);
         var response = await httpClient.GetAsync(timelineUrl, ct);
         response.EnsureSuccessStatusCode();
@@ -309,7 +303,7 @@ public async Task<List<FailedTestRunResponse>> GetPipelineFailedTestResults(stri
 
     public async Task<string> GetBuildLogLinesUnauthenticated(string project, int buildId, int logId, CancellationToken ct = default)
     {
-        var logUrl = $"{AZURE_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}/logs/{logId}?api-version=7.1";
+        var logUrl = $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}/logs/{logId}?api-version=7.1";
         logger.LogDebug("Fetching log file from {url}", logUrl);
         var response = await httpClient.GetAsync(logUrl, ct);
         response.EnsureSuccessStatusCode();
@@ -321,7 +315,7 @@ public async Task<LogAnalysisResponse> AnalyzePipelineFailureLogs(string? projec
     {
         try
         {
-            project ??= PUBLIC_PROJECT;
+            project ??= Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT;
             var session = $"{project}-{buildId}";
             List<string> logs = [];
 
@@ -330,7 +324,7 @@ public async Task<LogAnalysisResponse> AnalyzePipelineFailureLogs(string? projec
                 string logText;
                 logger.LogDebug("Downloading pipeline failure log for {project} {buildId} {logId}", project, buildId, logId);
 
-                if (project == PUBLIC_PROJECT)
+                if (project == Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT)
                 {
                     logText = await GetBuildLogLinesUnauthenticated(project, buildId, logId, ct);
                 }
diff --git a/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Tools/AzurePipelines/PipelineDetailsTool.cs b/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Tools/AzurePipelines/PipelineDetailsTool.cs
@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using Azure.Core;
 using Azure.Sdk.Tools.Cli.Commands;
+using Azure.Sdk.Tools.Cli.Configuration;
 using Azure.Sdk.Tools.Cli.Contract;
 using Azure.Sdk.Tools.Cli.Models;
 using Azure.Sdk.Tools.Cli.Services;
@@ -73,10 +74,10 @@ private void Initialize()
         {
             return;
         }
-        var tokenScope = new[] { "499b84ac-1321-427f-aa17-267ca6975798/.default" };  // Azure DevOps scope
+        var tokenScope = new[] { Constants.AZURE_DEVOPS_TOKEN_SCOPE };
         var token = azureService.GetCredential().GetToken(new TokenRequestContext(tokenScope));
         var tokenCredential = new VssOAuthAccessTokenCredential(token.Token);
-        var connection = new VssConnection(new Uri($"https://dev.azure.com/azure-sdk"), tokenCredential);
+        var connection = new VssConnection(new Uri(Constants.AZURE_SDK_DEVOPS_BASE_URL), tokenCredential);
         buildClient = connection.GetClient<BuildHttpClient>();
     }
 
@@ -103,12 +104,12 @@ public async Task<ObjectCommandResponse> GetPipelineRun(int buildId, string? pro
 
         try
         {
-            var build = await buildClient.GetBuildAsync("public", buildId);
+            var build = await buildClient.GetBuildAsync(Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT, buildId);
             return new ObjectCommandResponse { Result = build };
         }
         catch (Exception)
         {
-            var build = await buildClient.GetBuildAsync("internal", buildId);
+            var build = await buildClient.GetBuildAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId);
             return new ObjectCommandResponse { Result = build };
         }
     }
diff --git a/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Tools/AzurePipelines/PipelineTestsTool.cs b/tools/azsdk-cli/Azure.Sdk.Tools.Cli/Tools/AzurePipelines/PipelineTestsTool.cs

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using System.Text;`
`13`	`13`	`using System.Text.Json;`
`14`	`14`	`using System.Text.RegularExpressions;`
	`15`	`+using Azure.Sdk.Tools.Cli.Configuration;`
`15`	`16`	`using Azure.Sdk.Tools.Cli.Models;`
`16`	`17`	`using Azure.Sdk.Tools.Cli.Models.Responses;`
`17`	`18`
`@@ -30,7 +31,6 @@ public class DevOpsConnection : IDevOpsConnection`
`30`	`31`	`private WorkItemTrackingHttpClient _workItemClient;`
`31`	`32`	`private ProjectHttpClient _projectClient;`
`32`	`33`	`private AccessToken? _token;`
`33`		`- private static readonly string DEVOPS_SCOPE = "499b84ac-1321-427f-aa17-267ca6975798/.default";`
`34`	`34`
`35`	`35`	`private void RefreshConnection()`
`36`	`36`	`{`
`@@ -39,11 +39,11 @@ private void RefreshConnection()`
`39`	`39`
`40`	`40`	`try`
`41`	`41`	`{`
`42`		`- _token = (new DefaultAzureCredential()).GetToken(new TokenRequestContext([DEVOPS_SCOPE]));`
	`42`	`+ _token = (new DefaultAzureCredential()).GetToken(new TokenRequestContext([Constants.AZURE_DEVOPS_TOKEN_SCOPE]));`
`43`	`43`	`}`
`44`	`44`	`catch`
`45`	`45`	`{`
`46`		`- _token = (new InteractiveBrowserCredential()).GetToken(new TokenRequestContext([DEVOPS_SCOPE]));`
	`46`	`+ _token = (new InteractiveBrowserCredential()).GetToken(new TokenRequestContext([Constants.AZURE_DEVOPS_TOKEN_SCOPE]));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (_token == null)`
`@@ -52,7 +52,7 @@ private void RefreshConnection()`
`52`	`52`
`53`	`53`	`try`
`54`	`54`	`{`
`55`		`- var connection = new VssConnection(new Uri(DevOpsService.DEVOPS_URL), new VssOAuthAccessTokenCredential(_token?.Token));`
	`55`	`+ var connection = new VssConnection(new Uri(Constants.AZURE_SDK_DEVOPS_BASE_URL), new VssOAuthAccessTokenCredential(_token?.Token));`
`56`	`56`	`_buildClient = connection.GetClient<BuildHttpClient>();`
`57`	`57`	`_workItemClient = connection.GetClient<WorkItemTrackingHttpClient>();`
`58`	`58`	`_projectClient = connection.GetClient<ProjectHttpClient>();`
`@@ -103,13 +103,8 @@ public interface IDevOpsService`
`103`	`103`
`104`	`104`	`public partial class DevOpsService(ILogger<DevOpsService> logger, IDevOpsConnection connection) : IDevOpsService`
`105`	`105`	`{`
`106`		`- public static readonly string DEVOPS_URL = "https://dev.azure.com/azure-sdk";`
`107`		`- public static readonly string RELEASE_PROJECT = "release";`
`108`		`- public static readonly string INTERNAL_PROJECT = "internal";`
`109`	`106`	`private static readonly string RELEASE_PLANER_APP_TEST = "Release Planner App Test";`
`110`	`107`
`111`		`- private const string PUBLIC_PROJECT = "public";`
`112`		`-`
`113`	`108`	`[GeneratedRegex("\\\|\\s(Beta\|Stable\|GA)\\s\\\|\\s([\\S]+)\\s\\\|\\s([\\S]+)\\s\\\|")]`
`114`	`109`	`private static partial Regex SdkReleaseDetailsRegex();`
`115`	`110`
`@@ -128,7 +123,7 @@ public async Task<ReleasePlan> GetReleasePlanForWorkItemAsync(int workItemId)`
`128`	`123`	`public async Task<ReleasePlan> GetReleasePlanAsync(int releasePlanId)`
`129`	`124`	`{`
`130`	`125`	`// First find the API spec work item`
`131`		`- var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{RELEASE_PROJECT}' AND [Custom.ReleasePlanID] = '{releasePlanId}' AND [System.WorkItemType] = 'Release Plan' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";`
	`126`	`+ var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.ReleasePlanID] = '{releasePlanId}' AND [System.WorkItemType] = 'Release Plan' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";`
`132`	`127`	`var releasePlanWorkItems = await FetchWorkItemsAsync(query);`
`133`	`128`	`if (releasePlanWorkItems.Count == 0)`
`134`	`129`	`{`
`@@ -209,7 +204,7 @@ public async Task<ReleasePlan> GetReleasePlanAsync(string pullRequestUrl)`
`209`	`204`	`// First find the API spec work item`
`210`	`205`	`try`
`211`	`206`	`{`
`212`		`- var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{RELEASE_PROJECT}' AND [Custom.RESTAPIReviews] CONTAINS WORDS '{pullRequestUrl}' AND [System.WorkItemType] = 'API Spec' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";`
	`207`	`+ var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT}' AND [Custom.RESTAPIReviews] CONTAINS WORDS '{pullRequestUrl}' AND [System.WorkItemType] = 'API Spec' AND [System.State] NOT IN ('Closed','Duplicate','Abandoned')";`
`213`	`208`	`var apiSpecWorkItems = await FetchWorkItemsAsync(query);`
`214`	`209`	`if (apiSpecWorkItems.Count == 0)`
`215`	`210`	`{`
`@@ -335,7 +330,7 @@ private async Task<WorkItem> CreateWorkItemAsync(ReleasePlan releasePlan, string`
`335`	`330`
`336`	`331`	`logger.LogInformation($"Creating {workItemType} work item");`
`337`	`332`	`logger.LogInformation($"Request data to DeVops: {JsonSerializer.Serialize(specDocument)}");`
`338`		`- var workItem = await connection.GetWorkItemClient().CreateWorkItemAsync(specDocument, RELEASE_PROJECT, workItemType);`
	`333`	`+ var workItem = await connection.GetWorkItemClient().CreateWorkItemAsync(specDocument, Constants.AZURE_SDK_DEVOPS_RELEASE_PROJECT, workItemType);`
`339`	`334`	`if (workItem == null)`
`340`	`335`	`{`
`341`	`336`	`throw new Exception("Failed to create Work Item");`
`@@ -536,8 +531,8 @@ public async Task<Build> RunPipelineAsync(int pipelineDefinitionId, Dictionary<s`
`536`	`531`
`537`	`532`	`var buildClient = connection.GetBuildClient();`
`538`	`533`	`var projectClient = connection.GetProjectClient();`
`539`		`- var definition = await buildClient.GetDefinitionAsync(INTERNAL_PROJECT, pipelineDefinitionId);`
`540`		`- var project = await projectClient.GetProject(INTERNAL_PROJECT);`
	`534`	`+ var definition = await buildClient.GetDefinitionAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, pipelineDefinitionId);`
	`535`	`+ var project = await projectClient.GetProject(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT);`
`541`	`536`
`542`	`537`	`// Queue SDK generation pipeline`
`543`	`538`	`logger.LogInformation($"Queueing pipeline [{definition.Name}].");`
`@@ -555,13 +550,13 @@ public async Task<Build> RunPipelineAsync(int pipelineDefinitionId, Dictionary<s`
`555`	`550`	`public async Task<Build> GetPipelineRunAsync(int buildId)`
`556`	`551`	`{`
`557`	`552`	`var buildClient = connection.GetBuildClient();`
`558`		`- return await buildClient.GetBuildAsync(INTERNAL_PROJECT, buildId);`
	`553`	`+ return await buildClient.GetBuildAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId);`
`559`	`554`	`}`
`560`	`555`
`561`	`556`	`public async Task<string> GetSDKPullRequestFromPipelineRunAsync(int buildId, string language, int workItemId)`
`562`	`557`	`{`
`563`	`558`	`var buildClient = connection.GetBuildClient();`
`564`		`- var timeLine = await buildClient.GetBuildTimelineAsync(INTERNAL_PROJECT, buildId);`
	`559`	`+ var timeLine = await buildClient.GetBuildTimelineAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId);`
`565`	`560`	`var createPrJob = timeLine.Records.FirstOrDefault(r => r.Name == "Create pull request") ?? null;`
`566`	`561`	`if (createPrJob == null)`
`567`	`562`	`{`
`@@ -571,7 +566,7 @@ public async Task<string> GetSDKPullRequestFromPipelineRunAsync(int buildId, str`
`571`	`566`	`// Get SDK pull request from create pull request job attachment`
`572`	`567`	`if (createPrJob.Result == TaskResult.Succeeded)`
`573`	`568`	`{`
`574`		`- var contentStream = await buildClient.GetAttachmentAsync(INTERNAL_PROJECT, buildId, timeLine.Id, createPrJob.Id, "Distributedtask.Core.Summary", "Pull Request Created");`
	`569`	`+ var contentStream = await buildClient.GetAttachmentAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId, timeLine.Id, createPrJob.Id, "Distributedtask.Core.Summary", "Pull Request Created");`
`575`	`570`	`if (contentStream != null)`
`576`	`571`	`{`
`577`	`572`	`var content = new StreamReader(contentStream);`
`@@ -599,7 +594,7 @@ public async Task<string> GetSDKPullRequestFromPipelineRunAsync(int buildId, str`
`599`	`594`
`600`	`595`	`public static string GetPipelineUrl(int buildId)`
`601`	`596`	`{`
`602`		`- return $"https://dev.azure.com/azure-sdk/internal/_build/results?buildId={buildId}";`
	`597`	`+ return $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/internal/_build/results?buildId={buildId}";`
`603`	`598`	`}`
`604`	`599`
`605`	`600`	`public static string ParseSDKPullRequestUrl(string sdkGenerationSummary)`
`@@ -847,7 +842,7 @@ public async Task<PackageResponse> GetPackageWorkItemAsync(string packageName, s`
`847`	`842`	`throw new ArgumentException("Invalid data in one of the parameters.");`
`848`	`843`	`}`
`849`	`844`
`850`		`- var query = $"SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = '{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}'";`
	`845`	`+ 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}'";`
`851`	`846`	`if (!string.IsNullOrEmpty(packageVersion))`
`852`	`847`	`{`
`853`	`848`	`query += $" AND [Custom.PackageVersion] = '{packageVersion}'";`
`@@ -960,7 +955,7 @@ private async Task<Dictionary<string, List<string>>> GetLlmArtifactsUnauthentica`
`960`	`955`	`{`
`961`	`956`	`var result = new Dictionary<string, List<string>>();`
`962`	`957`	`using var httpClient = new HttpClient();`
`963`		`- var artifactsUrl = $"https://dev.azure.com/azure-sdk/{project}/_apis/build/builds/{buildId}/artifacts?api-version=7.1-preview.5";`
	`958`	`+ var artifactsUrl = $"{Constants.AZURE_SDK_DEVOPS_BASE_URL}/{project}/_apis/build/builds/{buildId}/artifacts?api-version=7.1-preview.5";`
`964`	`959`	`var artifactsResponse = await httpClient.GetAsync(artifactsUrl);`
`965`	`960`	`artifactsResponse.EnsureSuccessStatusCode();`
`966`	`961`	`var artifactsJson = await artifactsResponse.Content.ReadAsStringAsync();`
`@@ -1045,7 +1040,7 @@ await Task.Factory.StartNew(() =>`
`1045`	`1040`
`1046`	`1041`	`public async Task<Dictionary<string, List<string>>> GetPipelineLlmArtifacts(string project, int buildId)`
`1047`	`1042`	`{`
`1048`		`- if (project == PUBLIC_PROJECT)`
	`1043`	`+ if (project == Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT)`
`1049`	`1044`	`{`
`1050`	`1045`	`return await GetLlmArtifactsUnauthenticated(project, buildId);`
`1051`	`1046`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.ComponentModel;`
`6`	`6`	`using Azure.Core;`
`7`	`7`	`using Azure.Sdk.Tools.Cli.Commands;`
	`8`	`+using Azure.Sdk.Tools.Cli.Configuration;`
`8`	`9`	`using Azure.Sdk.Tools.Cli.Contract;`
`9`	`10`	`using Azure.Sdk.Tools.Cli.Models;`
`10`	`11`	`using Azure.Sdk.Tools.Cli.Services;`
`@@ -73,10 +74,10 @@ private void Initialize()`
`73`	`74`	`{`
`74`	`75`	`return;`
`75`	`76`	`}`
`76`		`- var tokenScope = new[] { "499b84ac-1321-427f-aa17-267ca6975798/.default" }; // Azure DevOps scope`
	`77`	`+ var tokenScope = new[] { Constants.AZURE_DEVOPS_TOKEN_SCOPE };`
`77`	`78`	`var token = azureService.GetCredential().GetToken(new TokenRequestContext(tokenScope));`
`78`	`79`	`var tokenCredential = new VssOAuthAccessTokenCredential(token.Token);`
`79`		`- var connection = new VssConnection(new Uri($"https://dev.azure.com/azure-sdk"), tokenCredential);`
	`80`	`+ var connection = new VssConnection(new Uri(Constants.AZURE_SDK_DEVOPS_BASE_URL), tokenCredential);`
`80`	`81`	`buildClient = connection.GetClient<BuildHttpClient>();`
`81`	`82`	`}`
`82`	`83`
`@@ -103,12 +104,12 @@ public async Task<ObjectCommandResponse> GetPipelineRun(int buildId, string? pro`
`103`	`104`
`104`	`105`	`try`
`105`	`106`	`{`
`106`		`- var build = await buildClient.GetBuildAsync("public", buildId);`
	`107`	`+ var build = await buildClient.GetBuildAsync(Constants.AZURE_SDK_DEVOPS_PUBLIC_PROJECT, buildId);`
`107`	`108`	`return new ObjectCommandResponse { Result = build };`
`108`	`109`	`}`
`109`	`110`	`catch (Exception)`
`110`	`111`	`{`
`111`		`- var build = await buildClient.GetBuildAsync("internal", buildId);`
	`112`	`+ var build = await buildClient.GetBuildAsync(Constants.AZURE_SDK_DEVOPS_INTERNAL_PROJECT, buildId);`
`112`	`113`	`return new ObjectCommandResponse { Result = build };`
`113`	`114`	`}`
`114`	`115`	`}`