summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Elliott <james-d-elliott@users.noreply.github.com>2023-09-04 09:20:23 +1000
committerGitHub <noreply@github.com>2023-09-04 09:20:23 +1000
commitfb4be19d03de95c45ea06b3cc9586738b3579d31 (patch)
tree135f76adab9c9e8133e7f35a48bcfebbb8b45ce8
parent224c1f39cfb758533051b3dd74b4c2ad27099d8f (diff)
test: refactor linting (#5956)
Signed-off-by: James Elliott <james-d-elliott@users.noreply.github.com>
-rw-r--r--.golangci.yml6
-rw-r--r--internal/suites/docker.go19
-rw-r--r--internal/suites/suite_activedirectory.go17
-rw-r--r--internal/suites/suite_bypass_all.go17
-rw-r--r--internal/suites/suite_caddy.go26
-rw-r--r--internal/suites/suite_cli.go10
-rw-r--r--internal/suites/suite_docker.go17
-rw-r--r--internal/suites/suite_duo_push.go24
-rw-r--r--internal/suites/suite_envoy.go26
-rw-r--r--internal/suites/suite_haproxy.go26
-rw-r--r--internal/suites/suite_high_availability.go17
-rw-r--r--internal/suites/suite_ldap.go17
-rw-r--r--internal/suites/suite_mariadb.go17
-rw-r--r--internal/suites/suite_multi_cookie_domain.go17
-rw-r--r--internal/suites/suite_mysql.go17
-rw-r--r--internal/suites/suite_network_acl.go17
-rw-r--r--internal/suites/suite_oidc.go24
-rw-r--r--internal/suites/suite_oidc_traefik.go26
-rw-r--r--internal/suites/suite_one_factor_only.go17
-rw-r--r--internal/suites/suite_pathprefix.go19
-rw-r--r--internal/suites/suite_postgres.go17
-rw-r--r--internal/suites/suite_short_timeouts.go17
-rw-r--r--internal/suites/suite_standalone.go17
-rw-r--r--internal/suites/suite_traefik.go19
-rw-r--r--internal/suites/suite_traefik2.go33
-rw-r--r--internal/utils/exec.go10
26 files changed, 47 insertions, 442 deletions
diff --git a/.golangci.yml b/.golangci.yml
index 9211cd5e5..1842bfe6a 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -58,12 +58,6 @@ issues:
- path: internal/commands/
linters:
- forbidigo
- - path: internal/suites/suite_(traefik2?|haproxy|envoy|caddy|oidc(_traefik)?|one_factor_only|short_timeouts|pathprefix|network_acl|standalone|postgres|mysql|mariadb|multi_cookie_domain|ldap|high_availability|duo_push|docker|cli|bypass_all|activedirectory)\.go # yamllint disable-line rule:line-length
- linters:
- - forbidigo
- - path: internal/utils/exec\.go
- linters:
- - forbidigo
- path: cmd/
linters:
- forbidigo
diff --git a/internal/suites/docker.go b/internal/suites/docker.go
index a3029c3e4..c58f21554 100644
--- a/internal/suites/docker.go
+++ b/internal/suites/docker.go
@@ -90,3 +90,22 @@ func (de *DockerEnvironment) Logs(service string, flags []string) (string, error
return string(content), err
}
+
+// PrintLogs for the given service names.
+func (de *DockerEnvironment) PrintLogs(services ...string) (err error) {
+ var logs string
+
+ for _, service := range services {
+ if service == "authelia-frontend" && os.Getenv("CI") == t {
+ continue
+ }
+
+ if logs, err = de.Logs(service, nil); err != nil {
+ return err
+ }
+
+ fmt.Println(logs) //nolint:forbidigo
+ }
+
+ return nil
+}
diff --git a/internal/suites/suite_activedirectory.go b/internal/suites/suite_activedirectory.go
index eac3af473..bfaa729af 100644
--- a/internal/suites/suite_activedirectory.go
+++ b/internal/suites/suite_activedirectory.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -32,21 +31,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_bypass_all.go b/internal/suites/suite_bypass_all.go
index d27b4079e..f0c26ab1f 100644
--- a/internal/suites/suite_bypass_all.go
+++ b/internal/suites/suite_bypass_all.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -32,21 +31,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_caddy.go b/internal/suites/suite_caddy.go
index 60b1d1ac7..7baf39fe3 100644
--- a/internal/suites/suite_caddy.go
+++ b/internal/suites/suite_caddy.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -45,30 +44,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- if os.Getenv("CI") != t {
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
- }
-
- caddyLogs, err := dockerEnvironment.Logs("caddy", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(caddyLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend", "caddy")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_cli.go b/internal/suites/suite_cli.go
index 095c4d9e3..db6c1b382 100644
--- a/internal/suites/suite_cli.go
+++ b/internal/suites/suite_cli.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -24,14 +23,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_docker.go b/internal/suites/suite_docker.go
index d083be134..0b5076dee 100644
--- a/internal/suites/suite_docker.go
+++ b/internal/suites/suite_docker.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -31,21 +30,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_duo_push.go b/internal/suites/suite_duo_push.go
index aa5b6484c..63ba8b122 100644
--- a/internal/suites/suite_duo_push.go
+++ b/internal/suites/suite_duo_push.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -32,28 +31,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- duoAPILogs, err := dockerEnvironment.Logs("duo-api", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(duoAPILogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend", "duo-api")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_envoy.go b/internal/suites/suite_envoy.go
index f20e3a5ab..16f40b59c 100644
--- a/internal/suites/suite_envoy.go
+++ b/internal/suites/suite_envoy.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -45,30 +44,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- if os.Getenv("CI") != t {
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
- }
-
- envoyLogs, err := dockerEnvironment.Logs("envoy", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(envoyLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend", "envoy")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_haproxy.go b/internal/suites/suite_haproxy.go
index 0ff031c1f..3b7c4fc8c 100644
--- a/internal/suites/suite_haproxy.go
+++ b/internal/suites/suite_haproxy.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -45,30 +44,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- if os.Getenv("CI") != t {
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
- }
-
- haproxyLogs, err := dockerEnvironment.Logs("haproxy", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(haproxyLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend", "haproxy")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_high_availability.go b/internal/suites/suite_high_availability.go
index b70c7b23b..42f4966f3 100644
--- a/internal/suites/suite_high_availability.go
+++ b/internal/suites/suite_high_availability.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -36,21 +35,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := haDockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := haDockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return haDockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_ldap.go b/internal/suites/suite_ldap.go
index 80b247374..6526ed743 100644
--- a/internal/suites/suite_ldap.go
+++ b/internal/suites/suite_ldap.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -33,21 +32,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_mariadb.go b/internal/suites/suite_mariadb.go
index 57c4ef2ee..79a1a366a 100644
--- a/internal/suites/suite_mariadb.go
+++ b/internal/suites/suite_mariadb.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -33,21 +32,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_multi_cookie_domain.go b/internal/suites/suite_multi_cookie_domain.go
index 7506487f3..fa7cb721f 100644
--- a/internal/suites/suite_multi_cookie_domain.go
+++ b/internal/suites/suite_multi_cookie_domain.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -31,21 +30,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := multiCookieDomainDockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := multiCookieDomainDockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return multiCookieDomainDockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_mysql.go b/internal/suites/suite_mysql.go
index e45119c62..8efc63d36 100644
--- a/internal/suites/suite_mysql.go
+++ b/internal/suites/suite_mysql.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -33,21 +32,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_network_acl.go b/internal/suites/suite_network_acl.go
index 6753353e6..64a66f4a1 100644
--- a/internal/suites/suite_network_acl.go
+++ b/internal/suites/suite_network_acl.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -34,21 +33,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_oidc.go b/internal/suites/suite_oidc.go
index 59ceb8805..5f4e41d3c 100644
--- a/internal/suites/suite_oidc.go
+++ b/internal/suites/suite_oidc.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -39,28 +38,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- oidcClientLogs, err := dockerEnvironment.Logs("oidc-client", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(oidcClientLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend", "oidc-client")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_oidc_traefik.go b/internal/suites/suite_oidc_traefik.go
index 5652455e3..3598a27fe 100644
--- a/internal/suites/suite_oidc_traefik.go
+++ b/internal/suites/suite_oidc_traefik.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -53,30 +52,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- if os.Getenv("CI") != t {
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
- }
-
- oidcClientLogs, err := dockerEnvironment.Logs("oidc-client", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(oidcClientLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend", "oidc-client")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_one_factor_only.go b/internal/suites/suite_one_factor_only.go
index dd12b58ad..ccd47d83c 100644
--- a/internal/suites/suite_one_factor_only.go
+++ b/internal/suites/suite_one_factor_only.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -30,21 +29,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_pathprefix.go b/internal/suites/suite_pathprefix.go
index 839280403..964bd40e8 100644
--- a/internal/suites/suite_pathprefix.go
+++ b/internal/suites/suite_pathprefix.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -45,23 +44,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- if os.Getenv("CI") != t {
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
- }
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_postgres.go b/internal/suites/suite_postgres.go
index 0512f3294..15ba587e2 100644
--- a/internal/suites/suite_postgres.go
+++ b/internal/suites/suite_postgres.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -33,21 +32,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_short_timeouts.go b/internal/suites/suite_short_timeouts.go
index 4650e06df..118ea0bc6 100644
--- a/internal/suites/suite_short_timeouts.go
+++ b/internal/suites/suite_short_timeouts.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"time"
)
@@ -31,21 +30,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_standalone.go b/internal/suites/suite_standalone.go
index 88d4d9f6e..dd798760a 100644
--- a/internal/suites/suite_standalone.go
+++ b/internal/suites/suite_standalone.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -36,21 +35,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_traefik.go b/internal/suites/suite_traefik.go
index a1cd06267..0af247e56 100644
--- a/internal/suites/suite_traefik.go
+++ b/internal/suites/suite_traefik.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -45,23 +44,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := dockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- if os.Getenv("CI") != t {
- frontendLogs, err := dockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
- }
-
- return nil
+ return dockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend")
}
teardown := func(suitePath string) error {
diff --git a/internal/suites/suite_traefik2.go b/internal/suites/suite_traefik2.go
index 747ef2030..01bf93626 100644
--- a/internal/suites/suite_traefik2.go
+++ b/internal/suites/suite_traefik2.go
@@ -1,7 +1,6 @@
package suites
import (
- "fmt"
"os"
"time"
)
@@ -47,37 +46,7 @@ func init() {
}
displayAutheliaLogs := func() error {
- backendLogs, err := traefik2DockerEnvironment.Logs("authelia-backend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(backendLogs)
-
- if os.Getenv("CI") != t {
- frontendLogs, err := traefik2DockerEnvironment.Logs("authelia-frontend", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(frontendLogs)
- }
-
- redisLogs, err := traefik2DockerEnvironment.Logs("redis", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(redisLogs)
-
- traefikLogs, err := traefik2DockerEnvironment.Logs("traefik", nil)
- if err != nil {
- return err
- }
-
- fmt.Println(traefikLogs)
-
- return nil
+ return traefik2DockerEnvironment.PrintLogs("authelia-backend", "authelia-frontend", "redis", "traefik")
}
teardown := func(suitePath string) error {
diff --git a/internal/utils/exec.go b/internal/utils/exec.go
index 6a56bf8ad..8dd56fac9 100644
--- a/internal/utils/exec.go
+++ b/internal/utils/exec.go
@@ -73,12 +73,12 @@ func RunCommandUntilCtrlC(cmd *exec.Cmd) {
f := bufio.NewWriter(os.Stdout)
defer f.Flush()
- fmt.Println("Hit Ctrl+C to shutdown...")
+ fmt.Println("Hit Ctrl+C to shutdown...") //nolint:forbidigo
err := cmd.Run()
if err != nil {
- fmt.Println(err)
+ fmt.Println(err) //nolint:forbidigo
cond.Broadcast()
mutex.Unlock()
@@ -109,13 +109,13 @@ func RunFuncUntilCtrlC(fn func() error) error {
f := bufio.NewWriter(os.Stdout)
defer f.Flush()
- fmt.Println("Hit Ctrl+C to shutdown...")
+ fmt.Println("Hit Ctrl+C to shutdown...") //nolint:forbidigo
err := fn()
if err != nil {
errorChannel <- err
- fmt.Println(err)
+ fmt.Println(err) //nolint:forbidigo
cond.Broadcast()
mutex.Unlock()
@@ -150,7 +150,7 @@ func RunCommandWithTimeout(cmd *exec.Cmd, timeout time.Duration) error {
select {
case <-time.After(timeout):
- fmt.Printf("Timeout of %ds reached... Killing process...\n", int64(timeout/time.Second))
+ fmt.Printf("Timeout of %ds reached... Killing process...\n", int64(timeout/time.Second)) //nolint:forbidigo
if err := cmd.Process.Kill(); err != nil {
return err