Skip to content

feat: Support Target TagSets in Tentacle Manager Registration #1185

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

Open
HuyPhanNguyen wants to merge 2 commits into
base: main
Choose a base branch
from
+211 −2
Open

feat: Support Target TagSets in Tentacle Manager Registration #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a3bbf
Tentacle manager valid single select tagsets
HuyPhanNguyen Feb 13, 2026
725e357
Merge branch 'main' into huy/2026/sc-132745-tentacle-manager-valid-si…
HuyPhanNguyen Feb 17, 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
212 changes: 210 additions & 2 deletions ...ce/Octopus.Manager.Tentacle/TentacleConfiguration/SetupWizard/SetupTentacleWizardModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class SetupTentacleWizardModel : ShellViewModel, IScriptableViewModel, IH
bool isSpaceDataLoaded;
bool isLoadingSpaceData;
string spaceDataLoadError;
string roleSelectionError;
string selectedMachinePolicy;
string selectedSpace;
string[] potentialEnvironments;
Expand All @@ -75,6 +76,8 @@ public class SetupTentacleWizardModel : ShellViewModel, IScriptableViewModel, IH
bool areSpacesSupported;
bool areWorkersSupported;
string currentUserId;
TagSetResource[] targetTagSets;
Dictionary<string, (string tagSetId, string tagSetType)> roleToTagSetMap;

public SetupTentacleWizardModel(
InstanceSelectionModel instanceSelectionModel,
Expand All @@ -97,6 +100,8 @@ ITelemetryService telemetryService
SelectedTenantTags = new ObservableCollection<string>();
SelectedWorkerPools = new ObservableCollection<string>();

SelectedRoles.CollectionChanged += SelectedRoles_CollectionChanged;

this.applicationName = ApplicationName.Tentacle;
this.ProxyWizardModel = new PollingProxyWizardModel(instanceSelectionModel);
this.ReviewAndRunScriptTabViewModel = new ReviewAndRunScriptTabViewModel(this, commandLineRunner, SendTentacleInstalledTelemetryEvent);
Expand Down Expand Up @@ -564,6 +569,17 @@ public string SpaceDataLoadError
}
}

public string RoleSelectionError
{
get => roleSelectionError;
set
{
if (value == roleSelectionError) return;
roleSelectionError = value;
OnPropertyChanged();
}
}

public bool IsNextEnabled => !IsLoadingSpaceData && string.IsNullOrEmpty(SpaceDataLoadError);

public IEnumerable<OctoService> Services
Expand Down Expand Up @@ -763,6 +779,7 @@ void UpdateStateWithLoadedSpaceData(SpaceSpecificData spaceSpecificData)
UpdateWorkerPools();
UpdateTenants();
UpdateMachinePolicies();
UpdateTargetTagSets();

void UpdateRoles() => PotentialRoles = spaceSpecificData.RoleNames.ToArray();

Expand Down Expand Up @@ -810,6 +827,66 @@ void UpdateSelection(ObservableCollection<string> selectedCollection, IEnumerabl
var potentialValuesSet = new HashSet<string>(potentialValues, StringComparer.Ordinal);
selectedCollection.RemoveWhere(v => !potentialValuesSet.Contains(v));
}

void UpdateTargetTagSets()
{
try
{
if (spaceSpecificData?.TargetTagSets == null)
{
targetTagSets = null;
roleToTagSetMap = null;
return;
}

targetTagSets = spaceSpecificData.TargetTagSets.ToArray();
BuildRoleToTagSetMap();
UpdatePotentialRolesWithTagSets();
}
catch
{
targetTagSets = null;
roleToTagSetMap = null;
}
}
}

void BuildRoleToTagSetMap()
{
roleToTagSetMap = new Dictionary<string, (string tagSetId, string tagSetType)>(StringComparer.OrdinalIgnoreCase);

if (targetTagSets == null) return;

foreach (var tagSet in targetTagSets)
{
if (tagSet?.Tags == null) continue;

foreach (var tag in tagSet.Tags)
{
if (!string.IsNullOrEmpty(tag?.Name))
roleToTagSetMap[tag.Name] = (tagSet.Id, tagSet.Type);
}
}
}

void UpdatePotentialRolesWithTagSets()
{
try
{
if (targetTagSets == null || targetTagSets.Length == 0) return;

var tagSetRoles = targetTagSets
.Where(ts => ts?.Tags != null)
.SelectMany(ts => ts.Tags.Where(t => !string.IsNullOrEmpty(t?.Name)).Select(t => t.Name))
.ToList();

if (tagSetRoles.Any())
PotentialRoles = PotentialRoles.Concat(tagSetRoles).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
catch
{
// If anything fails, PotentialRoles remains unchanged (old flow works)
}
}

static void AssertLoadedDataIsValid(SpaceSpecificData spaceSpecificData)
Expand Down Expand Up @@ -857,12 +934,123 @@ IValidator CreateValidator()
validator.RuleFor(m => m.SelectedSpace).NotEmpty().WithMessage("Please select a space").When(m => m.AreSpacesSupported);
validator.RuleFor(m => m.MachineName).NotEmpty().WithMessage("Please enter a machine name");
validator.RuleFor(m => m.SelectedRoles).NotEmpty().WithMessage("Please select or enter at least one role").Unless(m => m.MachineType == MachineType.Worker);
validator.RuleFor(m => m.SelectedRoles).Must(ValidateSingleSelectTagSets).WithMessage(m => GetSingleSelectValidationMessage()).Unless(m => m.MachineType == MachineType.Worker);
validator.RuleFor(m => m.SelectedEnvironments).NotEmpty().WithMessage("Please select an environment").Unless(m => m.MachineType == MachineType.Worker);
validator.RuleFor(m => m.SelectedWorkerPools).NotEmpty().WithMessage("Please select at least one worker pool").Unless(m => m.MachineType == MachineType.DeploymentTarget);
});
return validator;
}

void SelectedRoles_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
try
{
if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove)
return;

if (e.Action != System.Collections.Specialized.NotifyCollectionChangedAction.Add || roleToTagSetMap == null || targetTagSets == null || e.NewItems == null)
return;

foreach (var newItem in e.NewItems)
{
var newRole = newItem as string;
if (string.IsNullOrEmpty(newRole) || !roleToTagSetMap.ContainsKey(newRole))
{
RoleSelectionError = null;
continue;
}

var (tagSetId, tagSetType) = roleToTagSetMap[newRole];

if (tagSetType == "SingleSelect")
{
var existingRoleFromSameTagSet = SelectedRoles?.FirstOrDefault(r => r != newRole && roleToTagSetMap.ContainsKey(r) && roleToTagSetMap[r].tagSetId == tagSetId);

if (existingRoleFromSameTagSet != null)
{
var tagSet = targetTagSets.FirstOrDefault(ts => ts.Id == tagSetId);
var roleToRemove = newRole;

if (System.Windows.Application.Current?.Dispatcher != null)
{
System.Windows.Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{
try
{
SelectedRoles?.Remove(roleToRemove);
}
catch
{
// Silently fail - role stays selected, validation will catch it
}
}));
}

RoleSelectionError = $"You can only select one role from the '{tagSet?.Name ?? "this"}' tagset. '{existingRoleFromSameTagSet}' is already selected.";
return;
}
}

RoleSelectionError = null;
}
}
catch
{
// Silently fail - old flow continues to work
RoleSelectionError = null;
}
}

bool ValidateSingleSelectTagSets(ObservableCollection<string> selectedRoles)
{
try
{
if (selectedRoles == null || roleToTagSetMap == null || targetTagSets == null) return true;

var selectedRolesByTagSet = selectedRoles.Where(r => !string.IsNullOrEmpty(r) && roleToTagSetMap.ContainsKey(r)).GroupBy(r => roleToTagSetMap[r].tagSetId);

foreach (var tagSetGroup in selectedRolesByTagSet)
{
var tagSetId = tagSetGroup.Key;
var tagSet = targetTagSets.FirstOrDefault(ts => ts.Id == tagSetId);

if (tagSet?.Type == "SingleSelect" && tagSetGroup.Count() > 1)
return false;
}

return true;
}
catch
{
return true; // On error, pass validation (old flow works)
}
}

string GetSingleSelectValidationMessage()
{
try
{
if (SelectedRoles == null || roleToTagSetMap == null || targetTagSets == null) return string.Empty;

var selectedRolesByTagSet = SelectedRoles.Where(r => !string.IsNullOrEmpty(r) && roleToTagSetMap.ContainsKey(r)).GroupBy(r => roleToTagSetMap[r].tagSetId);

foreach (var tagSetGroup in selectedRolesByTagSet)
{
var tagSetId = tagSetGroup.Key;
var tagSet = targetTagSets.FirstOrDefault(ts => ts.Id == tagSetId);

if (tagSet?.Type == "SingleSelect" && tagSetGroup.Count() > 1)
return $"You can only select one role from the '{tagSet.Name}' tagset. Please deselect: {string.Join(", ", tagSetGroup.Skip(1))}";
}

return string.Empty;
}
catch
{
return string.Empty; // On error, no validation message
}
}

bool BeAValidUrl(string s)
{
Uri uri;
Expand Down Expand Up @@ -1019,6 +1207,7 @@ public class SpaceSpecificData
public List<TenantResource> Tenants { get; }
public bool MachinePoliciesAreSupported { get; }
public List<MachinePolicyResource> MachinePolicies { get; }
public List<TagSetResource> TargetTagSets { get; }

// Don't update any state while loading data.
// This prevents the UI from changing multiple times while loading.
Expand All @@ -1040,7 +1229,9 @@ public static async Task<SpaceSpecificData> LoadSpaceSpecificData(Action<string>

var (machinePoliciesAreSupported, machinePolicies) = await GetMachinePolicies();

return new SpaceSpecificData(machineRoles, environments, workerPools, areTenantsSupported, tenantTagSets, tenants, machinePoliciesAreSupported, machinePolicies);
var targetTagSets = await LoadTargetTagSets();

return new SpaceSpecificData(machineRoles, environments, workerPools, areTenantsSupported, tenantTagSets, tenants, machinePoliciesAreSupported, machinePolicies, targetTagSets);

async Task<List<WorkerPoolResource>> LoadWorkerPools()
{
Expand Down Expand Up @@ -1074,6 +1265,21 @@ async Task<List<TenantResource>> LoadTenants()
return (false, new List<MachinePolicyResource>());
}
}

async Task<List<TagSetResource>> LoadTargetTagSets()
{
try
{
onProgress("Getting available target tagsets...");
var allTagSets = await repository.TagSets.GetAll(CancellationToken.None);
return allTagSets.Where(ts => ts.Type != "FreeText" && ts.Scopes != null && ts.Scopes.Contains("Target")).OrderBy(ts => ts.SortOrder).ToList();
}
catch
{
// Backward compatibility - older servers don't have target tagsets
return new List<TagSetResource>();
}
}
}

SpaceSpecificData(List<string> roleNames,
Expand All @@ -1083,7 +1289,8 @@ async Task<List<TenantResource>> LoadTenants()
List<TagSetResource> tenantTags,
List<TenantResource> tenants,
bool machinePoliciesAreSupported,
List<MachinePolicyResource> machinePolicies)
List<MachinePolicyResource> machinePolicies,
List<TagSetResource> targetTagSets)
{
RoleNames = roleNames;
Environments = environments;
Expand All @@ -1093,6 +1300,7 @@ async Task<List<TenantResource>> LoadTenants()
Tenants = tenants;
MachinePoliciesAreSupported = machinePoliciesAreSupported;
MachinePolicies = machinePolicies;
TargetTagSets = targetTagSets;
}
}

Expand Down
1 change: 1 addition & 0 deletions ...us.Manager.Tentacle/TentacleConfiguration/SetupWizard/Views/TentacleActiveDetailsTab.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<TextBlock TextWrapping="Wrap" Foreground="Gray" Text="Choose at least one environment for the deployment target." FontSize="10"/>

<controls:AutoCompleteTagControl SuggestedTags="{Binding Path=PotentialRoles}" SelectedTags="{Binding SelectedRoles}" TagName="roles" HorizontalAlignment="Stretch" CanCreateNewTags="True" Margin="0,10,0,5"/>
<TextBlock Text="{Binding Path=RoleSelectionError}" TextWrapping="Wrap" Foreground="Red" FontSize="11" Visibility="{Binding Path=RoleSelectionError, Converter={StaticResource Converter.StringToVisibilityConverter}}" Margin="0,0,0,5"/>
<controls:ErrorMessage ErrorPath="SelectedRoles" />
<TextBlock TextWrapping="Wrap" Foreground="Gray" Text="Choose at least one role that this deployment target will provide." FontSize="10" HorizontalAlignment="Stretch" />
<Expander Padding="0" Header="Tenants" Style="{StaticResource CustomMaterialDesignExpander}" IsExpanded="{Binding AreTenantsAvailable}" Visibility="{Binding Path=AreTenantsSupported, Converter={StaticResource Converter.BooleanToVisibilityConverter}}" Background="White" Margin="0,20,0,0">
Expand Down