Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ test-all:

goimports-all:
@just _default_goimports k8s-test-runner
@just _default_goimports lib
@just _default_goimports parrot
@just _default_goimports tools/workflowresultparser
@just _default_goimports tools/asciitable
Expand Down
1 change: 1 addition & 0 deletions lib/.changeset/v1.54.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix tc logger for v0.36.0
1 change: 1 addition & 0 deletions lib/.changeset/v1.54.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Make Parrot Docker container startup time configurable
17 changes: 11 additions & 6 deletions lib/docker/test_env/parrot.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ import (
)

const (
defaultParrotImage = "kalverra/parrot"
defaultParrotVersion = "v0.6.2"
defaultParrotPort = "80"
defaultParrotImage = "kalverra/parrot"
defaultParrotVersion = "v0.6.2"
defaultParrotPort = "80"
defaultStartupTimeout = 10 * time.Second
)

// Parrot is a test environment component that wraps a Parrot server.
Expand Down Expand Up @@ -54,16 +55,20 @@ type ParrotAdapterResult struct {
func NewParrot(networks []string, opts ...EnvComponentOption) *Parrot {
p := &Parrot{
EnvComponent: EnvComponent{
ContainerName: fmt.Sprintf("%s-%s", "parrot", uuid.NewString()[0:3]),
Networks: networks,
StartupTimeout: 10 * time.Second,
ContainerName: fmt.Sprintf("%s-%s", "parrot", uuid.NewString()[0:3]),
Networks: networks,
},
l: log.Logger,
}
p.SetDefaultHooks()
for _, opt := range opts {
opt(&p.EnvComponent)
}

if p.StartupTimeout == 0 {
p.StartupTimeout = defaultStartupTimeout
}

return p
}

Expand Down
4 changes: 2 additions & 2 deletions lib/grafana/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ type GrafanaResponse struct {
}

// PostDashboard sends a request to create or update a Grafana dashboard.
// It returns the response containing the dashboard details, the HTTP response,
// and any error encountered during the request. This function is useful for
// It returns the response containing the dashboard details, the HTTP response,
// and any error encountered during the request. This function is useful for
// programmatically managing Grafana dashboards.
func (c *Client) PostDashboard(dashboard PostDashboardRequest) (GrafanaResponse, *resty.Response, error) {
var grafanaResp GrafanaResponse
Expand Down
Loading