feat: environment display names

Zywave · Apr 4, 2016 · ee332b2 · ee332b2
1 parent ab1238a
commit ee332b2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/nautilus/DeployCommand.cs b/nautilus/DeployCommand.cs
@@ -26,7 +26,9 @@ protected override int Run(OctopusProxy octopus)
                 return 1;
             }
 
-            WriteLine($"Target machine: {machine.Id} {machine.Name} {String.Join(",", machine.Roles)} {String.Join(",", machine.EnvironmentIds)}");
+            var environments = octopus.GetEnvironments().ToDictionary(i => i.Id);
+
+            WriteLine($"Target machine: {machine.Id} {machine.Name} {String.Join(",", machine.Roles)} {String.Join(",", machine.EnvironmentIds.Select(e => GetEnvironmentName(e, environments)))}");
 
             WriteLine($"Finding projects with the target roles ({String.Join(",", machine.Roles)})...");
 
@@ -51,15 +53,15 @@ protected override int Run(OctopusProxy octopus)
 
             var dashboard = octopus.GetDynamicDashboard(matchedProjects.Keys, machine.EnvironmentIds);
 
-            WriteLine($"Creating deployments for target environments ({String.Join(",", machine.EnvironmentIds)})...");
+            WriteLine($"Creating deployments for target environments ({String.Join(",", machine.EnvironmentIds.Select(e => GetEnvironmentName(e, environments)))})...");
 
             foreach(var item in dashboard.Items)
             {
                 if (item.ReleaseId != null)
                 {
                     var project = matchedProjects[item.ProjectId];
                     var deployment = octopus.CreateDeployment(machine.Id, item.ReleaseId, item.EnvironmentId, $"Nautilus: {machine.Id}");
-                    Write($" {deployment.Id} {project.Name} {item.ReleaseVersion} {item.EnvironmentId}");
+                    Write($" {deployment.Id} {project.Name} {item.ReleaseVersion} -> {GetEnvironmentName(item.EnvironmentId, environments)}");
                     if (Wait) 
                     {
                         Write($"... ");
@@ -93,5 +95,15 @@ private static bool HasAnyRole(DeploymentProcessResource deploymentProcess, IEnu
 
             return false;
         }
+
+        private static string GetEnvironmentName(string environmentId, IDictionary<string, EnvironmentResource> lookup)
+        {
+            EnvironmentResource environment;
+            if (lookup.TryGetValue(environmentId, out environment))
+            {
+                return environment.Name;
+            }
+            return environmentId;
+        }
     }
 }
diff --git a/nautilus/OctopusProxy.cs b/nautilus/OctopusProxy.cs
@@ -68,6 +68,11 @@ public IEnumerable<ProjectResource> GetProjects()
             return _repository.Projects.FindAll();
         }
 
+        public IEnumerable<EnvironmentResource> GetEnvironments()
+        {
+            return _repository.Environments.FindAll();
+        }
+
         public DeploymentProcessResource GetDeploymentProcess(string id)
         {
             return _repository.DeploymentProcesses.Get(id);