fix ignoring filters on inventory overrides

Author: umputun

README.md

@@ -46,7 +46,7 @@ SimploTask supports the following command-line options:
   If not specified all the tasks will be executed.
 - `-d`, `--target=`: Specifies the target name to use for the task execution. The target should be defined in the playbook file and can represent remote hosts, inventory files, or inventory URLs. If not specified the `default` target will be used. User can pass a host name or IP instead of the target name for a quick override. Providing the `-d`, `--target` flag multiple times with different targets sets multiple destination targets or multiple hosts, e.g., `-d prod -d dev` or `-d example1.com -d example2.com`.
 - `-c`, `--concurrent=`: Sets the number of concurrent hosts to execute tasks. Defaults to `1`, which means hosts will be handled  sequentially.
-- `ssh-timeout`: Sets the SSH timeout. Defaults to `30s`.
+- `timeout`: Sets the SSH timeout. Defaults to `30s`.
 - `-f`, `--filter=`: Filter destinations for the specified target. Providing the `-f` flag multiple times with different name, or hosts names or ips/fqdns allow multiple destination hosts from the selected target, e.g., `-f apollo -f h2.example2.com`
 - `--inventory-file=`: Specifies the inventory file to use for the task execution. Overrides the inventory file defined in the
   playbook file.

app/config/config.go

@@ -249,11 +249,19 @@ func (p *PlayBook) TargetHosts(name string) ([]Destination, error) {
 
 	// check if we have overrides for inventory file, this is second priority
 	if p.overrides != nil && p.overrides.InventoryFile != "" {
-		return loadInventoryFile(p.overrides.InventoryFile, nil)
+		res, err := loadInventoryFile(p.overrides.InventoryFile, nil)
+		if err != nil {
+			return nil, err
+		}
+		return p.filterHosts(res, p.overrides), nil
 	}
 	// check if we have overrides for inventory http, this is third priority
 	if p.overrides != nil && p.overrides.InventoryURL != "" {
-		return loadInventoryURL(p.overrides.InventoryURL, nil)
+		res, err := loadInventoryURL(p.overrides.InventoryURL, nil)
+		if err != nil {
+			return nil, err
+		}
+		return p.filterHosts(res, p.overrides), nil
 	}
 
 	// no overrides, check if we have target in config

app/config/config_test.go

@@ -469,6 +469,17 @@ func TestPlayBook_TargetHostsOverrides(t *testing.T) {
 		}, res)
 	})
 
+	t.Run("override hosts with file, filtered", func(t *testing.T) {
+		c, err := New("testdata/f1.yml", &Overrides{InventoryFile: "testdata/hosts-without-groups.yml", FilterHosts: []string{"h2", "h3"}})
+		require.NoError(t, err)
+		res, err := c.TargetHosts("blah")
+		require.NoError(t, err)
+		assert.Equal(t, []Destination{
+			{Name: "h2", Host: "h2.example.com", Port: 2233, User: "umputun"},
+			{Name: "h3", Host: "h3.example.com", Port: 22, User: "user1"},
+		}, res)
+	})
+
 	t.Run("override hosts with file not found", func(t *testing.T) {
 		c, err := New("testdata/f1.yml", &Overrides{InventoryFile: "testdata/hosts_not_found"})
 		require.NoError(t, err)
@@ -499,6 +510,24 @@ func TestPlayBook_TargetHostsOverrides(t *testing.T) {
 		}, res)
 	})
 
+	t.Run("override hosts with http, filtered", func(t *testing.T) {
+		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			fh, err := os.Open("testdata/hosts-without-groups.yml")
+			require.NoError(t, err)
+			defer fh.Close()
+			_, err = io.Copy(w, fh)
+			require.NoError(t, err)
+		}))
+		defer ts.Close()
+		c, err := New("testdata/f1.yml", &Overrides{InventoryURL: ts.URL, FilterHosts: []string{"h3", "h4.example.com"}})
+		require.NoError(t, err)
+		res, err := c.TargetHosts("blah")
+		require.NoError(t, err)
+		assert.Equal(t, []Destination{
+			{Name: "h3", Host: "h3.example.com", Port: 22, User: "user1"},
+			{Name: "h4", Host: "h4.example.com", Port: 22, User: "user2"},
+		}, res)
+	})
 	t.Run("override hosts with http failed", func(t *testing.T) {
 		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusInternalServerError)

app/main.go

@@ -28,7 +28,7 @@ type options struct {
 	TaskName     string        `short:"t" long:"task" description:"task name"`
 	Targets      []string      `short:"d" long:"target" description:"target name" default:"default"`
 	Concurrent   int           `short:"c" long:"concurrent" description:"concurrent tasks" default:"1"`
-	SSHTimeout   time.Duration `long:"ssh-timeout" description:"ssh timeout" default:"30s"`
+	SSHTimeout   time.Duration `long:"timeout" description:"ssh timeout" default:"30s"`
 
 	// target overrides
 	Filter        []string `short:"f" long:"filter" description:"filter target hosts"`