Skip to content

chore: refactor test resource applier #2731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

chore: refactor test resource applier #2731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cde5070
sort resources
k15r Dec 1, 2025
f4cd35d
automatic sorting, readinessChecks and cleanup for tests
k15r Dec 1, 2025
0ed3dd4
remove cleanups
k15r Dec 1, 2025
e3d9797
ignore not found errors in automatic cleanup
k15r Dec 1, 2025
9d42578
remove more cleanups
k15r Dec 2, 2025
330da13
Merge remote-tracking branch 'upstream/main' into refactor-tests-reso…
k15r Dec 2, 2025
10e9ebc
no cleanup in max-pipelines
k15r Dec 2, 2025
7922478
less cleanup
k15r Dec 2, 2025
4ccbaeb
remove testing.T
k15r Dec 2, 2025
a3539b3
fail if deletion fails
k15r Dec 2, 2025
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
2 changes: 2 additions & 0 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ linters:
alias: fbports
- pkg: github.com/kyma-project/telemetry-manager/webhook/utils
alias: webhookutils
- pkg: github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects
alias: kitk8sobjects
no-unaliased: true
no-extra-aliases: true
loggercheck:
Expand Down
17 changes: 5 additions & 12 deletions docs/contributor/pocs/ginkgo-to-go-testing/_service_name_enrichment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package migrated

import (
"context"
"fmt"
"io"
"net/http"
Expand All @@ -11,19 +10,19 @@ import (
"testing"

. "github.com/onsi/gomega"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdloggen"

telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1"
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
"github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdloggen"
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen"
"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
"github.com/kyma-project/telemetry-manager/test/testkit/suite"
Expand Down Expand Up @@ -59,7 +58,7 @@ func TestOTelLogPipeline_ServiceNameEnrichment(t *testing.T) {
},
logProducerFunc: func(deploymentName, namespace string) client.Object {
podSpecWithUndefinedService := telemetrygen.PodSpec(telemetrygen.SignalTypeLogs, telemetrygen.WithServiceName(""))
return kitk8s.NewDeployment(deploymentName, namespace).
return objects.NewDeployment(deploymentName, namespace).
WithLabel(appLabelName, appLabelValue).
WithPodSpec(podSpecWithUndefinedService).
K8sObject()
Expand Down Expand Up @@ -110,23 +109,17 @@ func TestOTelLogPipeline_ServiceNameEnrichment(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(mockNs).K8sObject(),
objects.NewNamespace(mockNs).K8sObject(),
&pipeline,
tc.logProducerFunc(genName, mockNs),
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
// Cannot use t.Context() here because it is already canceled at this point
err := kitk8s.DeleteObjects(context.Background(), suite.K8sClient, resources...)
require.NoError(t, err)
})
Expect(kitk8s.CreateObjects(t.Context(), resources...)).Should(Succeed())

t.Log("Waiting for resources to be ready")

assert.DeploymentReady(t.Context(), suite.K8sClient, kitkyma.LogGatewayName)
assert.DeploymentReady(t.Context(), suite.K8sClient, types.NamespacedName{Name: backend.Name(), Namespace: mockNs})
assert.LogPipelineOtelHealthy(t.Context(), suite.K8sClient, pipelineName)
assert.OtelLogsFromNamespaceDelivered(suite.ProxyClient, backend.ExportURL(suite.ProxyClient), mockNs)

Expand Down
8 changes: 3 additions & 5 deletions test/e2e/logs/agent/instrumentation_scope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -37,16 +38,13 @@ func TestInstrumentationScope(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(genNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(genNs).K8sObject(),
stdoutloggen.NewDeployment(genNs).K8sObject(),
&pipeline,
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down
8 changes: 3 additions & 5 deletions test/e2e/logs/agent/severity_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -51,8 +52,8 @@ func TestSeverityParser(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(genNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(genNs).K8sObject(),
stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(levelINFOScenario)).WithName(levelINFOScenario["scenario"]).K8sObject(),
stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(levelWarningScenario)).WithName(levelWarningScenario["scenario"]).K8sObject(),
stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(logLevelScenario)).WithName(logLevelScenario["scenario"]).K8sObject(),
Expand All @@ -61,9 +62,6 @@ func TestSeverityParser(t *testing.T) {
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down
8 changes: 3 additions & 5 deletions test/e2e/logs/agent/trace_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -59,8 +60,8 @@ func TestTraceParser(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(genNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(genNs).K8sObject(),
stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(traceIdFullOnlyScenario)).WithName(traceIdFullOnlyScenario["scenario"]).K8sObject(),
stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(traceparentOnlyScenario)).WithName(traceparentOnlyScenario["scenario"]).K8sObject(),
stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(traceIdPartialOnlyScenario)).WithName(traceIdPartialOnlyScenario["scenario"]).K8sObject(),
Expand All @@ -70,9 +71,6 @@ func TestTraceParser(t *testing.T) {
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down
14 changes: 6 additions & 8 deletions test/e2e/logs/fluentbit/app_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
"github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -44,11 +45,11 @@ func TestAppName(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(nsNone).K8sObject(),
kitk8s.NewNamespace(nsAppOnly).K8sObject(),
kitk8s.NewNamespace(nsNameOnly).K8sObject(),
kitk8s.NewNamespace(nsMixed).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(nsNone).K8sObject(),
kitk8sobjects.NewNamespace(nsAppOnly).K8sObject(),
kitk8sobjects.NewNamespace(nsNameOnly).K8sObject(),
kitk8sobjects.NewNamespace(nsMixed).K8sObject(),
logProducerNone.K8sObject(),
logProducerAppOnly.K8sObject(),
logProducerNameOnly.K8sObject(),
Expand All @@ -57,9 +58,6 @@ func TestAppName(t *testing.T) {
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down
8 changes: 3 additions & 5 deletions test/e2e/logs/fluentbit/base_payload_with_http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
"github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -37,16 +38,13 @@ func TestBasePayloadWithHTTPOutput(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(genNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(genNs).K8sObject(),
logProducer.K8sObject(),
&pipeline,
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down
8 changes: 3 additions & 5 deletions test/e2e/logs/fluentbit/custom_cluster_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
"github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -54,17 +55,15 @@ func TestCustomClusterName(t *testing.T) {
}, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed())

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(genNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(genNs).K8sObject(),
&pipeline,
logProducer.K8sObject(),
telemetrygen.NewPod(genNs, telemetrygen.SignalTypeMetrics).K8sObject(),
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())

Eventually(func(g Gomega) {
g.Expect(suite.K8sClient.Get(context.Background(), kitkyma.TelemetryName, &telemetry)).Should(Succeed()) //nolint:usetesting // Remove ctx from Get
telemetry.Spec.Enrichments.Cluster = &operatorv1alpha1.Cluster{}
Expand All @@ -75,7 +74,6 @@ func TestCustomClusterName(t *testing.T) {

assert.BackendReachable(t, backend)
assert.DaemonSetReady(t, kitkyma.FluentBitDaemonSetName)
assert.DeploymentReady(t, logProducer.NamespacedName())
assert.FluentBitLogPipelineHealthy(t, pipelineName)

assert.BackendDataEventuallyMatches(t, backend,
Expand Down
22 changes: 6 additions & 16 deletions test/e2e/logs/fluentbit/custom_filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen"
Expand All @@ -37,15 +38,11 @@ func TestCustomFilterDenied(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
&pipeline,
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})

Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down Expand Up @@ -74,15 +71,11 @@ func TestCustomOutputDenied(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
&pipeline,
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})

Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down Expand Up @@ -120,18 +113,15 @@ func TestCustomFilterAllowed(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(includeNs).K8sObject(),
kitk8s.NewNamespace(excludeNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(includeNs).K8sObject(),
kitk8sobjects.NewNamespace(excludeNs).K8sObject(),
logProducerInclude.K8sObject(),
logProducerExclude.K8sObject(),
&pipeline,
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down
8 changes: 3 additions & 5 deletions test/e2e/logs/fluentbit/custom_output_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
"github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -41,16 +42,13 @@ func TestCustomOutput(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(genNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(genNs).K8sObject(),
logProducer.K8sObject(),
&pipeline,
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
Expand Down
9 changes: 3 additions & 6 deletions test/e2e/logs/fluentbit/dedot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
testutils "github.com/kyma-project/telemetry-manager/internal/utils/test"
"github.com/kyma-project/telemetry-manager/test/testkit/assert"
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects"
kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
"github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit"
kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
Expand Down Expand Up @@ -40,21 +41,17 @@ func TestDedot(t *testing.T) {
Build()

resources := []client.Object{
kitk8s.NewNamespace(backendNs).K8sObject(),
kitk8s.NewNamespace(genNs).K8sObject(),
kitk8sobjects.NewNamespace(backendNs).K8sObject(),
kitk8sobjects.NewNamespace(genNs).K8sObject(),
logProducer.K8sObject(),
&pipeline,
}
resources = append(resources, backend.K8sObjects()...)

t.Cleanup(func() {
Expect(kitk8s.DeleteObjects(resources...)).To(Succeed())
})
Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed())

assert.BackendReachable(t, backend)
assert.DaemonSetReady(t, kitkyma.FluentBitDaemonSetName)
assert.DeploymentReady(t, logProducer.NamespacedName())
assert.FluentBitLogPipelineHealthy(t, pipelineName)

assert.BackendDataEventuallyMatches(t, backend,
Expand Down
Loading
Loading