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
4 changes: 1 addition & 3 deletions internal/controller/reconcile-captenant_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package controller

import (
"context"
"os"
"testing"

"github.com/sap/cap-operator/pkg/apis/sme.sap.com/v1alpha1"
Expand Down Expand Up @@ -286,8 +285,7 @@ func TestCAPTenantUpgradeOperationCompleted(t *testing.T) {
}

func TestCAPTenantUpgradeOperationCompletedPreviousVersionsLimited(t *testing.T) {
os.Setenv(v1alpha1.EnvMaxTenantVersionHistory, "3")
defer os.Unsetenv(v1alpha1.EnvMaxTenantVersionHistory)
t.Setenv(v1alpha1.EnvMaxTenantVersionHistory, "3")
reconcileTestItem(
context.TODO(), t,
QueueItem{Key: ResourceCAPTenant, ResourceKey: NamespacedResourceKey{Namespace: "default", Name: "test-cap-01-provider"}},
Expand Down
4 changes: 1 addition & 3 deletions internal/controller/reconcile-captenantoperation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package controller

import (
"context"
"os"
"testing"
)

Expand Down Expand Up @@ -54,8 +53,7 @@ func TestTenantOperationInitializeStep(t *testing.T) {
func TestTenantOperationWithNoSteps(t *testing.T) {
// Env set for this test to enable coverage for detailed metrics --> this has no impact on tenant operation code/test as such.
detailedMetrics := "DETAILED_OPERATIONAL_METRICS"
defer os.Unsetenv(detailedMetrics)
os.Setenv(detailedMetrics, "true")
t.Setenv(detailedMetrics, "true")
err := reconcileTestItem(
context.TODO(), t,
QueueItem{Key: ResourceCAPTenantOperation, ResourceKey: NamespacedResourceKey{Namespace: "default", Name: "test-cap-01-provider-abcd"}},
Expand Down
41 changes: 20 additions & 21 deletions internal/controller/reconcile-domain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package controller

import (
"context"
"os"
"testing"
)

Expand Down Expand Up @@ -132,7 +131,7 @@ func TestDomain_ProcessingWithIngressWithAdditionalCACertificateCreateFailed(t *
}

func TestDomain_ProcessingWithIngressCertManager(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -148,11 +147,11 @@ func TestDomain_ProcessingWithIngressCertManager(t *testing.T) {
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_ProcessingWithIngressCertManagerCustomIssuerRef(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -168,11 +167,11 @@ func TestDomain_ProcessingWithIngressCertManagerCustomIssuerRef(t *testing.T) {
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_ProcessingWithIngressCertManagerCommonName(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -188,11 +187,11 @@ func TestDomain_ProcessingWithIngressCertManagerCommonName(t *testing.T) {
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_ProcessingWithIngressCertManagerCustomIssuerRefAndCommonName(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -208,11 +207,11 @@ func TestDomain_ProcessingWithIngressCertManagerCustomIssuerRefAndCommonName(t *
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_ProcessingWithIngressCertManagerWithAdditionalCACertificate(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -228,7 +227,7 @@ func TestDomain_ProcessingWithIngressCertManagerWithAdditionalCACertificate(t *t
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_ProcessingWithIngressCertGateway(t *testing.T) {
Expand Down Expand Up @@ -303,7 +302,7 @@ func TestDomain_Ready(t *testing.T) {
}

func TestDomain_ReadyWithCertManager(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -321,7 +320,7 @@ func TestDomain_ReadyWithCertManager(t *testing.T) {
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_DnsError(t *testing.T) {
Expand Down Expand Up @@ -371,7 +370,7 @@ func TestDomain_CertificateError(t *testing.T) {
}

func TestDomain_CertManagerError(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

err := reconcileTestItem(
context.TODO(), t,
Expand All @@ -394,7 +393,7 @@ func TestDomain_CertManagerError(t *testing.T) {
t.Error("Wrong error message")
}

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_UpdateDomain(t *testing.T) {
Expand Down Expand Up @@ -547,7 +546,7 @@ func TestDomain_RemoveAdditionalCACertificateDeleteError(t *testing.T) {
}

func TestDomain_UpdateCertManagerConfig(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -565,11 +564,11 @@ func TestDomain_UpdateCertManagerConfig(t *testing.T) {
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_UpdateDomainWithCertManager(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -588,7 +587,7 @@ func TestDomain_UpdateDomainWithCertManager(t *testing.T) {
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_DeletionTimestampSet(t *testing.T) {
Expand Down Expand Up @@ -663,7 +662,7 @@ func TestDomain_DeletingWithCertSecretDeleteError(t *testing.T) {
}

func TestDomain_DeletingWithCertManager(t *testing.T) {
os.Setenv(certManagerEnv, certManagerCertManagerIO)
t.Setenv(certManagerEnv, certManagerCertManagerIO)

reconcileTestItem(
context.TODO(), t,
Expand All @@ -679,7 +678,7 @@ func TestDomain_DeletingWithCertManager(t *testing.T) {
},
)

os.Setenv(certManagerEnv, "")
t.Setenv(certManagerEnv, "")
}

func TestDomain_DuplicateDomains(t *testing.T) {
Expand Down
5 changes: 0 additions & 5 deletions internal/controller/reconcile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package controller

import (
"context"
"os"
"reflect"
"strconv"
"strings"
Expand Down Expand Up @@ -366,10 +365,6 @@ func getTestController(resources testResources) *Controller {
}

func TestMain(m *testing.M) {
os.Setenv(certManagerEnv, "gardener")
os.Setenv(dnsManagerEnv, "gardener")
defer os.Setenv(certManagerEnv, "")
defer os.Setenv(dnsManagerEnv, "")
m.Run()
}

Expand Down
3 changes: 0 additions & 3 deletions internal/controller/rollout-manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package controller

import (
"context"
"os"
"testing"
"time"

Expand Down Expand Up @@ -143,8 +142,6 @@ func TestGetRolloutDelay_DefaultWhenUnset(t *testing.T) {
}

func TestGetRolloutDelay_DefaultWhenEnvVarNotPresent(t *testing.T) {
os.Unsetenv(EnvRolloutDelay)
t.Cleanup(func() { os.Unsetenv(EnvRolloutDelay) })
if got := getRolloutDelay(); got != defaultRolloutDelay {
t.Errorf("expected default %v when env var absent, got %v", defaultRolloutDelay, got)
}
Expand Down
16 changes: 4 additions & 12 deletions internal/controller/version-monitoring_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"io"
"net/http"
"net/http/httptest"
"os"
"sync"
"sync/atomic"
"testing"
Expand Down Expand Up @@ -42,16 +41,13 @@ func TestMonitoringEnv(t *testing.T) {
for _, tt := range tests {
t.Run("test monitoring env", func(t *testing.T) {
if tt.add != nil {
os.Setenv(EnvPrometheusAddress, *tt.add)
defer os.Unsetenv(EnvPrometheusAddress)
t.Setenv(EnvPrometheusAddress, *tt.add)
}
if tt.acqRetryInt != nil {
os.Setenv(EnvPrometheusAcquireClientRetryDelay, *tt.acqRetryInt)
defer os.Unsetenv(EnvPrometheusAcquireClientRetryDelay)
t.Setenv(EnvPrometheusAcquireClientRetryDelay, *tt.acqRetryInt)
}
if tt.evalInt != nil {
os.Setenv(EnvMetricsEvaluationInterval, *tt.evalInt)
defer os.Unsetenv(EnvMetricsEvaluationInterval)
t.Setenv(EnvMetricsEvaluationInterval, *tt.evalInt)
}

mEnv := parseMonitoringEnv()
Expand Down Expand Up @@ -134,8 +130,7 @@ func TestGracefulShutdownMonitoringRoutines(t *testing.T) {
s, _ := getPromServer(false, []queryTestCase{})
defer s.Close()

os.Setenv(EnvPrometheusAddress, s.URL)
defer os.Unsetenv(EnvPrometheusAddress)
t.Setenv(EnvPrometheusAddress, s.URL)

testCtx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
Expand All @@ -150,9 +145,6 @@ func TestGracefulShutdownMonitoringRoutines(t *testing.T) {
t.Run("without PROMETHEUS_ADDRESS set", func(t *testing.T) {
defer deregisterMetrics()

// Ensure the env var is not set.
os.Unsetenv(EnvPrometheusAddress)

c := setupTestControllerWithInitialResources(t, []string{})

testCtx, cancel := context.WithTimeout(context.Background(), time.Second)
Expand Down