Skip to content

Adding url parameter to remove agent #5319

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Adding url parameter to remove agent #5319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2baa9d7
Adding url parameter to remove agent
Sep 10, 2025
7e8b0ac
Passing suppressPromptIfEmpty as a paramter with value true
Sep 11, 2025
531ae80
Merge branch 'master' into users/surajitshil-03/baseUriIssue
surajitshil-03 Sep 11, 2025
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
2 changes: 2 additions & 0 deletions src/Agent.Listener/CommandLine/RemoveAgent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ namespace Agent.Listener.CommandLine
[Verb(Constants.Agent.CommandLine.Commands.Remove)]
public class RemoveAgent : ConfigureOrRemoveBase
{
[Option(Constants.Agent.CommandLine.Args.Url)]
public string Url { get; set; }
}
}
9 changes: 6 additions & 3 deletions src/Agent.Listener/CommandSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,18 @@ public string GetToken()

public string GetUrl(bool suppressPromptIfEmpty = false)
{
// Check for URL from either Configure or Remove commands
string urlValue = Configure?.Url ?? Remove?.Url;

// Note, GetArg does not consume the arg (like GetArgOrPrompt does).
if (suppressPromptIfEmpty &&
string.IsNullOrEmpty(GetArg(Configure?.Url, Constants.Agent.CommandLine.Args.Url)))
string.IsNullOrEmpty(GetArg(urlValue, Constants.Agent.CommandLine.Args.Url)))
{
return string.Empty;
}

return GetArgOrPrompt(
argValue: Configure?.Url,
argValue: urlValue,
name: Constants.Agent.CommandLine.Args.Url,
description: StringUtil.Loc("ServerUrl"),
defaultValue: string.Empty,
Expand Down
9 changes: 9 additions & 0 deletions src/Agent.Listener/Configuration/ConfigurationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ public async Task UnconfigureAsync(CommandSettings command)
if (isConfigured && hasCredentials)
{
AgentSettings settings = _store.GetSettings();

var credentialManager = HostContext.GetService<ICredentialManager>();

// Get the credentials
Expand All @@ -602,6 +603,14 @@ public async Task UnconfigureAsync(CommandSettings command)
IConfigurationProvider agentProvider = (extensionManager.GetExtensions<IConfigurationProvider>()).FirstOrDefault(x => x.ConfigurationProviderType == agentType);
ArgUtil.NotNull(agentProvider, agentType);

// If a URL is provided via command line, override the stored ServerUrl BEFORE checking if hosted
string commandUrl = command.GetUrl(suppressPromptIfEmpty: true);
if (!string.IsNullOrEmpty(commandUrl))
{
Trace.Info($"Overriding stored ServerUrl '{settings.ServerUrl}' with command line URL '{commandUrl}' for removal operation");
settings.ServerUrl = commandUrl;
}

bool isHostedServer = await CheckIsHostedServer(agentProvider, settings, credProvider, agentCertManager.SkipServerCertificateValidation);
VssCredentials creds = credProvider.GetVssCredentials(HostContext);

Expand Down
Loading