Minor fixes

ezh · Dec 17, 2019 · 1f022fb · 1f022fb
1 parent d801260
commit 1f022fb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/cloudselect/discovery/aws.py b/cloudselect/discovery/aws.py
@@ -27,10 +27,8 @@ def __init__(self):
 
     def run(self):
         """Collect AWS instances."""
-        pathfinder = Container.pathfinder()
-
-        instances = list(self.instances())
-        return [pathfinder.run(i, instances) for i in instances]
+        self.logger.debug("Discover AWS instances")
+        return list(self.instances())
 
     def instances(self):
         """Collect AWS instances."""

diff --git a/cloudselect/discovery/local.py b/cloudselect/discovery/local.py
@@ -25,11 +25,8 @@ def __init__(self):
 
     def run(self):
         """Collect instances from shell output."""
-        pathfinder = Container.pathfinder()
-
-        logging.debug("Discover local instances")
-        instances = list(self.instances())
-        return [pathfinder.run(i, instances) for i in instances]
+        self.logger.debug("Discover local instances")
+        return list(self.instances())
 
     def instances(self):
         """Collect instances from shell output."""

diff --git a/cloudselect/group/simple.py b/cloudselect/group/simple.py
@@ -49,7 +49,7 @@ def run(self, name, metadata):
                                 "Match pattern {} and value {}".format(pattern, value),
                             )
                             result = group.get(name)
-                            if result:
+                            if result is not None:
                                 return result
                 else:
                     self.logger.warning(

diff --git a/cloudselect/selector.py b/cloudselect/selector.py
@@ -117,6 +117,7 @@ def profile_list(self):
     def profile_process(self):
         """Run selection process for the specific profile."""
         discovery = Container.discovery()
+        pathfinder = Container.pathfinder()
         profile_name = Container.args().profile
         report = Container.report()
 
@@ -125,6 +126,7 @@ def profile_process(self):
         if not instances:
             sys.exit("Error: No instances found")
         selected = self.fzf_select(instances)
+        selected = [pathfinder.run(i, instances) for i in selected]
         return report.run(selected)
 
     def select(self):