FIXUP: test ISO 8601, max length on rules

Author: cbandy

config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml

@@ -1954,8 +1954,9 @@ spec:
                           How long to retain log files locally. An RFC 3339 duration or a number
                           and unit: `3d`, `4 weeks`, `12 hr`, etc.
                         format: duration
+                        maxLength: 20
                         minLength: 1
-                        pattern: ^(PT)?[0-9]+ *(?i:(h|hr|d|w|wk)|(hour|day|week)s?)+$
+                        pattern: ^(PT)?( *[0-9]+ *(?i:(h|hr|d|w|wk)|(hour|day|week)s?))+$
                         type: string
                         x-kubernetes-validations:
                         - message: must be at least one hour

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

@@ -11487,8 +11487,9 @@ spec:
                           How long to retain log files locally. An RFC 3339 duration or a number
                           and unit: `3d`, `4 weeks`, `12 hr`, etc.
                         format: duration
+                        maxLength: 20
                         minLength: 1
-                        pattern: ^(PT)?[0-9]+ *(?i:(h|hr|d|w|wk)|(hour|day|week)s?)+$
+                        pattern: ^(PT)?( *[0-9]+ *(?i:(h|hr|d|w|wk)|(hour|day|week)s?))+$
                         type: string
                         x-kubernetes-validations:
                         - message: must be at least one hour

internal/testing/validation/pgadmin_test.go

@@ -60,7 +60,8 @@ func TestPGAdminInstrumentation(t *testing.T) {
 				"28 weeks",
 				"90 DAY",
 				"1 hr",
-				"PT1D",
+				"PT1D2H",
+				"1 week 2 days",
 			} {
 				u, err := runtime.ToUnstructuredObject(pgadmin)
 				assert.NilError(t, err)
@@ -73,8 +74,12 @@ func TestPGAdminInstrumentation(t *testing.T) {
 
 		t.Run("Invalid", func(t *testing.T) {
 			for _, tt := range []string{
+				// Amount too small
 				"0 days",
 				"0",
+
+				// Text too long
+				"2 weeks 3 days 4 hours",
 			} {
 				u, err := runtime.ToUnstructuredObject(pgadmin)
 				assert.NilError(t, err)

pkg/apis/postgres-operator.crunchydata.com/v1beta1/instrumentation_types.go

@@ -58,12 +58,15 @@ type InstrumentationLogsSpec struct {
 	// ---
 	// Kubernetes ensures the value is in the "duration" format, but go ahead
 	// and loosely validate the format to show some acceptable units.
-	// +kubebuilder:validation:Pattern=`^(PT)?[0-9]+ *(?i:(h|hr|d|w|wk)|(hour|day|week)s?)+$`
+	// +kubebuilder:validation:Pattern=`^(PT)?( *[0-9]+ *(?i:(h|hr|d|w|wk)|(hour|day|week)s?))+$`
 	//
 	// `controller-gen` needs to know "Type=string" to allow a "Pattern".
 	// +kubebuilder:validation:Type=string
 	//
+	// Set a max length to keep rule costs low.
+	// +kubebuilder:validation:MaxLength=20
 	// +kubebuilder:validation:XValidation:rule=`duration("1h") <= self && self <= duration("8760h")`,message="must be at least one hour"
+	//
 	// +optional
 	RetentionPeriod *Duration `json:"retentionPeriod,omitempty"`
 }

pkg/apis/postgres-operator.crunchydata.com/v1beta1/shared_types_test.go

@@ -48,6 +48,9 @@ func TestDurationYAML(t *testing.T) {
 	})
 
 	t.Run("UnitsIn", func(t *testing.T) {
+		const Day = 24 * time.Hour
+		const Week = 7 * Day
+
 		for _, tt := range []struct {
 			input  string
 			result time.Duration
@@ -91,16 +94,19 @@ func TestDurationYAML(t *testing.T) {
 			{"4 hours", 4 * time.Hour},
 			{"5 hourglass", 5 * time.Hour},
 
-			{"1d", 24 * time.Hour},
-			{"2 day", 2 * 24 * time.Hour},
-			{"3 days", 3 * 24 * time.Hour},
-			{"4 dayrock", 4 * 24 * time.Hour},
+			{"1d", Day},
+			{"2 day", 2 * Day},
+			{"3 days", 3 * Day},
+			{"4 dayrock", 4 * Day},
+
+			{"1w", Week},
+			{"2 wk", 2 * Week},
+			{"3 week", 3 * Week},
+			{"4 weeks", 4 * Week},
+			{"5 weekpasta", 5 * Week},
 
-			{"1w", 7 * 24 * time.Hour},
-			{"2 wk", 2 * 7 * 24 * time.Hour},
-			{"3 week", 3 * 7 * 24 * time.Hour},
-			{"4 weeks", 4 * 7 * 24 * time.Hour},
-			{"5 weekpasta", 5 * 7 * 24 * time.Hour},
+			// ISO 8601 / RFC 33339
+			{"PT2D9H", (2 * Day) + 9*time.Hour},
 		} {
 			var parsed Duration
 			assert.NilError(t, yaml.Unmarshal([]byte(tt.input), &parsed))