forked from testcontainers/testcontainers-go
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(wait): strategy walk (testcontainers#2895)
* feat(wait): strategy walk Add the Walk method which allows consumers to walk strategies and if desired update or remove them. This is useful for modules which want to update strategy details based on user customisations performed by functional options passed to their run methods. * chore(wait): improve walk docs * core(wait): fix typo in docs link --------- Co-authored-by: Manuel de la Peña <[email protected]>
- Loading branch information
1 parent
5baaa6c
commit db43391
Showing
5 changed files
with
226 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Walk | ||
|
||
Walk walks the strategies tree and calls the visit function for each node. | ||
|
||
This allows modules to easily amend default wait strategies, updating or | ||
removing specific strategies based on requirements of functional options. | ||
|
||
For example removing a TLS strategy if a functional option enabled insecure mode | ||
or changing the location of the certificate based on the configured user. | ||
|
||
If visit function returns `wait.VisitStop`, the walk stops. | ||
If visit function returns `wait.VisitRemove`, the current node is removed. | ||
|
||
## Walk removing entries | ||
|
||
The following example shows how to remove a strategy based on its type. | ||
<!--codeinclude--> | ||
[Remove FileStrategy entries](../../../wait/walk_test.go) inside_block:walkRemoveFileStrategy | ||
<!--/codeinclude--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
package wait | ||
|
||
import ( | ||
"errors" | ||
) | ||
|
||
var ( | ||
// VisitStop is used as a return value from [VisitFunc] to stop the walk. | ||
// It is not returned as an error by any function. | ||
VisitStop = errors.New("stop the walk") | ||
|
||
// VisitRemove is used as a return value from [VisitFunc] to have the current node removed. | ||
// It is not returned as an error by any function. | ||
VisitRemove = errors.New("remove this strategy") | ||
) | ||
|
||
// VisitFunc is a function that visits a strategy node. | ||
// If it returns [VisitStop], the walk stops. | ||
// If it returns [VisitRemove], the current node is removed. | ||
type VisitFunc func(root Strategy) error | ||
|
||
// Walk walks the strategies tree and calls the visit function for each node. | ||
func Walk(root *Strategy, visit VisitFunc) error { | ||
if root == nil { | ||
return errors.New("root strategy is nil") | ||
} | ||
|
||
if err := walk(root, visit); err != nil { | ||
if errors.Is(err, VisitRemove) || errors.Is(err, VisitStop) { | ||
return nil | ||
} | ||
return err | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// walk walks the strategies tree and calls the visit function for each node. | ||
// It returns an error if the visit function returns an error. | ||
func walk(root *Strategy, visit VisitFunc) error { | ||
if *root == nil { | ||
// No strategy. | ||
return nil | ||
} | ||
|
||
// Allow the visit function to customize the behaviour of the walk before visiting the children. | ||
if err := visit(*root); err != nil { | ||
if errors.Is(err, VisitRemove) { | ||
*root = nil | ||
} | ||
|
||
return err | ||
} | ||
|
||
if s, ok := (*root).(*MultiStrategy); ok { | ||
var i int | ||
for range s.Strategies { | ||
if err := walk(&s.Strategies[i], visit); err != nil { | ||
if errors.Is(err, VisitRemove) { | ||
s.Strategies = append(s.Strategies[:i], s.Strategies[i+1:]...) | ||
if errors.Is(err, VisitStop) { | ||
return VisitStop | ||
} | ||
continue | ||
} | ||
|
||
return err | ||
} | ||
i++ | ||
} | ||
} | ||
|
||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
package wait_test | ||
|
||
import ( | ||
"errors" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
|
||
"github.com/testcontainers/testcontainers-go" | ||
"github.com/testcontainers/testcontainers-go/wait" | ||
) | ||
|
||
func TestWalk(t *testing.T) { | ||
req := testcontainers.ContainerRequest{ | ||
WaitingFor: wait.ForAll( | ||
wait.ForFile("/tmp/file"), | ||
wait.ForHTTP("/health"), | ||
wait.ForAll( | ||
wait.ForFile("/tmp/other"), | ||
), | ||
), | ||
} | ||
|
||
t.Run("walk", func(t *testing.T) { | ||
var count int | ||
err := wait.Walk(&req.WaitingFor, func(_ wait.Strategy) error { | ||
count++ | ||
return nil | ||
}) | ||
require.NoError(t, err) | ||
require.Equal(t, 5, count) | ||
}) | ||
|
||
t.Run("stop", func(t *testing.T) { | ||
var count int | ||
err := wait.Walk(&req.WaitingFor, func(_ wait.Strategy) error { | ||
count++ | ||
return wait.VisitStop | ||
}) | ||
require.NoError(t, err) | ||
require.Equal(t, 1, count) | ||
}) | ||
|
||
t.Run("remove", func(t *testing.T) { | ||
// walkRemoveFileStrategy { | ||
var count, matched int | ||
err := wait.Walk(&req.WaitingFor, func(s wait.Strategy) error { | ||
count++ | ||
if _, ok := s.(*wait.FileStrategy); ok { | ||
matched++ | ||
return wait.VisitRemove | ||
} | ||
|
||
return nil | ||
}) | ||
// } | ||
require.NoError(t, err) | ||
require.Equal(t, 5, count) | ||
require.Equal(t, 2, matched) | ||
|
||
count = 0 | ||
matched = 0 | ||
err = wait.Walk(&req.WaitingFor, func(s wait.Strategy) error { | ||
count++ | ||
if _, ok := s.(*wait.FileStrategy); ok { | ||
matched++ | ||
} | ||
return nil | ||
}) | ||
require.NoError(t, err) | ||
require.Equal(t, 3, count) | ||
require.Zero(t, matched) | ||
}) | ||
|
||
t.Run("remove-stop", func(t *testing.T) { | ||
req := testcontainers.ContainerRequest{ | ||
WaitingFor: wait.ForAll( | ||
wait.ForFile("/tmp/file"), | ||
wait.ForHTTP("/health"), | ||
), | ||
} | ||
var count int | ||
err := wait.Walk(&req.WaitingFor, func(_ wait.Strategy) error { | ||
count++ | ||
return errors.Join(wait.VisitRemove, wait.VisitStop) | ||
}) | ||
require.NoError(t, err) | ||
require.Equal(t, 1, count) | ||
require.Nil(t, req.WaitingFor) | ||
}) | ||
|
||
t.Run("nil-root", func(t *testing.T) { | ||
err := wait.Walk(nil, func(_ wait.Strategy) error { | ||
return nil | ||
}) | ||
require.EqualError(t, err, "root strategy is nil") | ||
}) | ||
|
||
t.Run("direct-single", func(t *testing.T) { | ||
req := testcontainers.ContainerRequest{ | ||
WaitingFor: wait.ForFile("/tmp/file"), | ||
} | ||
requireVisits(t, req, 1) | ||
}) | ||
|
||
t.Run("for-all-single", func(t *testing.T) { | ||
req := testcontainers.ContainerRequest{ | ||
WaitingFor: wait.ForAll( | ||
wait.ForFile("/tmp/file"), | ||
), | ||
} | ||
requireVisits(t, req, 2) | ||
}) | ||
} | ||
|
||
// requireVisits validates the number of visits for a given request. | ||
func requireVisits(t *testing.T, req testcontainers.ContainerRequest, expected int) { | ||
t.Helper() | ||
|
||
var count int | ||
err := wait.Walk(&req.WaitingFor, func(_ wait.Strategy) error { | ||
count++ | ||
return nil | ||
}) | ||
require.NoError(t, err) | ||
require.Equal(t, expected, count) | ||
} |