Merge pull request #1114 from OctopusDeploy/wlthomson/label-disabled-tenants-in-setup-dropdown

Author: wlthomson

source/Octopus.Manager.Tentacle/TentacleConfiguration/SetupWizard/SetupTentacleWizardModel.cs

@@ -56,7 +56,7 @@ public class SetupTentacleWizardModel : ShellViewModel, IScriptableViewModel, IH
         string[] potentialRoles;
         string[] potentialMachinePolicies;
         string[] potentialTenantTags;
-        string[] potentialTenants;
+        TenantDisplayItem[] potentialTenants;
         string[] potentialWorkerPools;
         string[] potentialSpaces;
         string machineName;
@@ -321,17 +321,23 @@ public string[] PotentialTenantTags
             }
         }
 
-        public string[] PotentialTenants
+        public TenantDisplayItem[] PotentialTenants
         {
             get => potentialTenants;
             set
             {
                 if (Equals(value, potentialTenants)) return;
                 potentialTenants = value;
                 OnPropertyChanged();
+                OnPropertyChanged(nameof(PotentialTenantNames));
             }
         }
 
+        public string[] PotentialTenantNames
+        {
+            get => potentialTenants?.Select(t => t.GetDisplayName()).ToArray() ?? Array.Empty<string>();
+        }
+
         public string[] PotentialWorkerPools
         {
             get => potentialWorkerPools;
@@ -777,8 +783,8 @@ void UpdateTenants()
                 AreTenantsSupported = spaceSpecificData.AreTenantsSupported;
                 PotentialTenantTags = spaceSpecificData.TenantTags.SelectMany(tt => tt.Tags.Select(t => t.CanonicalTagName)).ToArray();
                 UpdateSelection(SelectedTenantTags, PotentialTenantTags);
-                PotentialTenants = spaceSpecificData.Tenants.Select(tt => tt.Name).ToArray();
-                UpdateSelection(SelectedTenants, PotentialTenants);
+                PotentialTenants = spaceSpecificData.Tenants.Select(tt => new TenantDisplayItem(tt.Name, tt.IsDisabled)).ToArray();
+                UpdateSelection(SelectedTenants, PotentialTenants.Select(t => t.GetDisplayName()));
                 AreTenantsAvailable = PotentialTenants.Any();
             }
 
@@ -929,7 +935,10 @@ public IEnumerable<CommandLineInvocation> GenerateScript()
                             register.Argument("tenanttag", tag);
 
                         foreach (var tenant in SelectedTenants)
-                            register.Argument("tenant", tenant);
+                        {
+                            var tenantItem = PotentialTenants.FirstOrDefault(t => t.GetDisplayName() == tenant);
+                            register.Argument("tenant", tenantItem?.Name ?? tenant);
+                        }
                     }
 
                     foreach (var role in SelectedRoles)
@@ -1086,4 +1095,21 @@ async Task<List<TenantResource>> LoadTenants()
             MachinePolicies = machinePolicies;
         }
     }
+
+    public class TenantDisplayItem
+    {
+        public string Name { get; }
+        public bool IsDisabled { get; }
+
+        public TenantDisplayItem(string name, bool isDisabled)
+        {
+            Name = name;
+            IsDisabled = isDisabled;
+        }
+
+        public string GetDisplayName()
+        {
+            return IsDisabled ? $"{Name} (disabled)" : Name;
+        }
+    }
 }

source/Octopus.Manager.Tentacle/TentacleConfiguration/SetupWizard/Views/TentacleActiveDetailsTab.xaml

@@ -60,7 +60,7 @@
                             <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">
                                 <StackPanel Background="White">
-                                    <controls:AutoCompleteTagControl SuggestedTags="{Binding Path=PotentialTenants}" SelectedTags="{Binding SelectedTenants}" TagName="tenants" CanCreateNewTags="False"/>
+                                    <controls:AutoCompleteTagControl SuggestedTags="{Binding Path=PotentialTenantNames}" SelectedTags="{Binding SelectedTenants}" TagName="tenants" CanCreateNewTags="False"/>
                                     <controls:ErrorMessage ErrorPath="SelectedTenants" />
                                     <TextBlock TextWrapping="Wrap" Foreground="Gray" Text="Choose tenants this deployment target should be associated with." FontSize="10"/>
 

source/Octopus.Tentacle/Octopus.Tentacle.csproj

@@ -53,7 +53,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
-		<PackageReference Include="Octopus.Client" Version="14.3.1508" />
+		<PackageReference Include="Octopus.Client" Version="15.2.2240" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Autofac" Version="4.6.2" />