- Use log package instead of fmt

- Use configurable timeout for all timeout types
- Use CommandContext for applying the global timeout
- For preventing memory leak extract the test function

Signed-off-by: Sergen Yalçın <yalcinsergen97@gmail.com>

cmd/uptest/main.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"gopkg.in/alecthomas/kingpin.v2"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/crossplane/uptest/internal"
 	"github.com/crossplane/uptest/internal/config"
@@ -93,7 +92,7 @@ func e2eTests() {
 		SetupScriptPath:          setupPath,
 		TeardownScriptPath:       teardownPath,
 		DefaultConditions:        strings.Split(*defaultConditions, ","),
-		DefaultTimeout:           v1.Duration{Duration: *defaultTimeout},
+		DefaultTimeout:           *defaultTimeout,
 		Directory:                *testDir,
 		SkipDelete:               *skipDelete,
 		OnlyCleanUptestResources: *onlyCleanUptestResources,

internal/config/config.go

@@ -8,7 +8,6 @@ package config
 import (
 	"time"
 
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -52,7 +51,7 @@ type AutomatedTest struct {
 	SetupScriptPath    string
 	TeardownScriptPath string
 
-	DefaultTimeout    v1.Duration
+	DefaultTimeout    time.Duration
 	DefaultConditions []string
 
 	SkipDelete bool
@@ -93,7 +92,7 @@ type Resource struct {
 	APIVersion string
 	Kind       string
 
-	Timeout              v1.Duration
+	Timeout              time.Duration
 	Conditions           []string
 	PreAssertScriptPath  string
 	PostAssertScriptPath string

internal/prepare.go

@@ -11,6 +11,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"log"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -93,7 +94,7 @@ func (p *preparer) prepareManifests() ([]config.Manifest, error) {
 			}
 			if u != nil {
 				if v, ok := u.GetAnnotations()["upjet.upbound.io/manual-intervention"]; ok {
-					fmt.Printf("Skipping %s with name %s since it requires the following manual intervention: %s\n", u.GroupVersionKind().String(), u.GetName(), v)
+					log.Printf("Skipping %s with name %s since it requires the following manual intervention: %s\n", u.GroupVersionKind().String(), u.GetName(), v)
 					continue
 				}
 				y, err := yaml.Marshal(u)

internal/runner.go

@@ -5,7 +5,7 @@
 package internal
 
 import (
-	"fmt"
+	"log"
 	"os"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
@@ -18,7 +18,7 @@ func RunTest(o *config.AutomatedTest) error {
 	if !o.RenderOnly {
 		defer func() {
 			if err := os.RemoveAll(o.Directory); err != nil {
-				fmt.Println(fmt.Sprint(err, "cannot clean the test directory"))
+				log.Printf("Cannot clean the test directory: %s\n", err.Error())
 			}
 		}()
 	}

internal/templates/00-apply.yaml.tmpl

@@ -6,9 +6,9 @@ metadata:
   name: apply
 spec:
   timeouts:
-    apply: 1m
+    apply: {{ .TestCase.Timeout }}
     assert: {{ .TestCase.Timeout }}
-    exec: 1m
+    exec: {{ .TestCase.Timeout }}
   steps:
   - name: Run Setup Script
     description: Setup the test environment by running the setup script.
@@ -32,8 +32,8 @@ spec:
     {{- end }}
   - name: Assert Status Conditions
     description: |
-      Assert applied resources. Firstly run the pre-assert script if exists.
-      Then check the status conditions. Finally run the post-assert script if
+      Assert applied resources. First, run the pre-assert script if exists.
+      Then, check the status conditions. Finally run the post-assert script if it
       exists.
     try:
     {{- range $resource := .Resources }}

internal/templates/01-update.yaml.tmpl

@@ -5,9 +5,9 @@ metadata:
   name: update
 spec:
   timeouts:
-    apply: 1m
+    apply: {{ .TestCase.Timeout }}
     assert: {{ .TestCase.Timeout }}
-    exec: 1m
+    exec: {{ .TestCase.Timeout }}
   steps:
   - name: Update Root Resource
     description: |

internal/templates/02-import.yaml.tmpl

@@ -5,9 +5,9 @@ metadata:
   name: import
 spec:
   timeouts:
-    apply: 1m
+    apply: {{ .TestCase.Timeout }}
     assert: {{ .TestCase.Timeout }}
-    exec: 3m
+    exec: {{ .TestCase.Timeout }}
   steps:
   - name: Remove State
     description: |