update tests

Author: benjaminjb

internal/collector/patroni_test.go

@@ -11,6 +11,7 @@ import (
 	"gotest.tools/v3/assert"
 
 	"github.com/crunchydata/postgres-operator/internal/feature"
+	"github.com/crunchydata/postgres-operator/internal/testing/require"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -23,8 +24,14 @@ func TestEnablePatroniLogging(t *testing.T) {
 		ctx := feature.NewContext(context.Background(), gate)
 
 		config := NewConfig(nil)
+		cluster := new(v1beta1.PostgresCluster)
+		require.UnmarshalInto(t, &cluster.Spec, `{
+			instrumentation: {
+				logs: { retentionPeriod: 5h },
+			},
+		}`)
 
-		EnablePatroniLogging(ctx, new(v1beta1.PostgresCluster), config)
+		EnablePatroniLogging(ctx, cluster, config)
 
 		result, err := config.ToYAML()
 		assert.NilError(t, err)

internal/collector/pgadmin_test.go

@@ -30,7 +30,14 @@ func TestEnablePgAdminLogging(t *testing.T) {
 
 		configmap := new(corev1.ConfigMap)
 		initialize.Map(&configmap.Data)
-		err := collector.EnablePgAdminLogging(ctx, nil, configmap)
+		retentionPeriod, err := v1beta1.NewDuration("12 hours")
+		assert.NilError(t, err)
+		instrumentation := v1beta1.InstrumentationSpec{
+			Logs: &v1beta1.InstrumentationLogsSpec{
+				RetentionPeriod: retentionPeriod,
+			},
+		}
+		err = collector.EnablePgAdminLogging(ctx, &instrumentation, configmap)
 		assert.NilError(t, err)
 
 		assert.Assert(t, cmp.MarshalMatches(configmap.Data, `

internal/collector/pgbackrest_test.go

@@ -27,8 +27,15 @@ func TestNewConfigForPgBackrestRepoHostPod(t *testing.T) {
 				Volume: new(v1beta1.RepoPVC),
 			},
 		}
+		retentionPeriod, err := v1beta1.NewDuration("12 hours")
+		assert.NilError(t, err)
+		instrumentation := v1beta1.InstrumentationSpec{
+			Logs: &v1beta1.InstrumentationLogsSpec{
+				RetentionPeriod: retentionPeriod,
+			},
+		}
 
-		config := NewConfigForPgBackrestRepoHostPod(ctx, nil, repos)
+		config := NewConfigForPgBackrestRepoHostPod(ctx, &instrumentation, repos)
 
 		result, err := config.ToYAML()
 		assert.NilError(t, err)

internal/collector/pgbouncer_test.go

@@ -11,6 +11,7 @@ import (
 	"gotest.tools/v3/assert"
 
 	"github.com/crunchydata/postgres-operator/internal/feature"
+	"github.com/crunchydata/postgres-operator/internal/testing/require"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -23,8 +24,13 @@ func TestEnablePgBouncerLogging(t *testing.T) {
 		ctx := feature.NewContext(context.Background(), gate)
 
 		config := NewConfig(nil)
-
-		EnablePgBouncerLogging(ctx, new(v1beta1.PostgresCluster), config)
+		cluster := new(v1beta1.PostgresCluster)
+		require.UnmarshalInto(t, &cluster.Spec, `{
+			instrumentation: {
+				logs: { retentionPeriod: 5h },
+			},
+		}`)
+		EnablePgBouncerLogging(ctx, cluster, config)
 
 		result, err := config.ToYAML()
 		assert.NilError(t, err)

internal/collector/postgres_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/crunchydata/postgres-operator/internal/feature"
 	"github.com/crunchydata/postgres-operator/internal/postgres"
+	"github.com/crunchydata/postgres-operator/internal/testing/require"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -25,6 +26,11 @@ func TestEnablePostgresLogging(t *testing.T) {
 
 		cluster := new(v1beta1.PostgresCluster)
 		cluster.Spec.PostgresVersion = 99
+		require.UnmarshalInto(t, &cluster.Spec, `{
+			instrumentation: {
+				logs: { retentionPeriod: 5h },
+			},
+		}`)
 
 		config := NewConfig(nil)
 		params := postgres.NewParameterSet()

internal/controller/postgrescluster/cluster_test.go

@@ -870,6 +870,11 @@ func TestPatroniLogSize(t *testing.T) {
 		reconciler := &Reconciler{Recorder: recorder}
 
 		cluster.Spec.Patroni = nil
+		require.UnmarshalInto(t, &cluster.Spec, `{
+			instrumentation: {
+				logs: { retentionPeriod: 5h },
+			},
+		}`)
 
 		size := reconciler.patroniLogSize(ctx, &cluster)