Merge pull request kubernetes#130706 from jpbetz/handle-optional-value-types-with-defaults

Declarative validation: Add default + optional handling

Author: k8s-ci-robot

staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/optional/nonzero_defaults/doc.go

@@ -0,0 +1,53 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:validation-gen=TypeMeta
+// +k8s:validation-gen-scheme-registry=k8s.io/code-generator/cmd/validation-gen/testscheme.Scheme
+
+// This is a test package.
+package nonzerodefaults
+
+import "k8s.io/code-generator/cmd/validation-gen/testscheme"
+
+var localSchemeBuilder = testscheme.New()
+
+type Struct struct {
+	TypeMeta int
+
+	// +k8s:optional
+	// +default="foobar"
+	StringField string `json:"stringField"`
+
+	// +k8s:optional
+	// +default="foobar"
+	StringPtrField *string `json:"stringPtrField"`
+
+	// +k8s:optional
+	// +default=123
+	IntField int `json:"intField"`
+
+	// +k8s:optional
+	// +default=123
+	IntPtrField *int `json:"intPtrField"`
+
+	// +k8s:optional
+	// +default=true
+	BoolField bool `json:"boolField"`
+
+	// +k8s:optional
+	// +default=true
+	BoolPtrField *bool `json:"boolPtrField"`
+}

staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/optional/nonzero_defaults/doc_test.go

@@ -0,0 +1,47 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package nonzerodefaults
+
+import (
+	"testing"
+
+	"k8s.io/utils/ptr"
+)
+
+func Test(t *testing.T) {
+	st := localSchemeBuilder.Test(t)
+
+	st.Value(&Struct{
+		// All zero-values.
+	}).ExpectRegexpsByPath(map[string][]string{
+		"stringField":    {"Required value"},
+		"stringPtrField": {"Required value"},
+		"intField":       {"Required value"},
+		"intPtrField":    {"Required value"},
+		"boolField":      {"Required value"},
+		"boolPtrField":   {"Required value"},
+	})
+
+	st.Value(&Struct{
+		StringField:    "abc",
+		StringPtrField: ptr.To(""),
+		IntField:       123,
+		IntPtrField:    ptr.To(0),
+		BoolField:      true,
+		BoolPtrField:   ptr.To(false),
+	}).ExpectValid()
+}

staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/optional/nonzero_defaults/zz_generated.validations.go

@@ -0,0 +1,53 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:validation-gen=TypeMeta
+// +k8s:validation-gen-scheme-registry=k8s.io/code-generator/cmd/validation-gen/testscheme.Scheme
+
+// This is a test package.
+package zerodefaults
+
+import "k8s.io/code-generator/cmd/validation-gen/testscheme"
+
+var localSchemeBuilder = testscheme.New()
+
+type Struct struct {
+	TypeMeta int
+
+	// +k8s:optional
+	// +default=""
+	StringField string `json:"stringField"`
+
+	// +k8s:optional
+	// +default=""
+	StringPtrField *string `json:"stringPtrField"`
+
+	// +k8s:optional
+	// +default=0
+	IntField int `json:"intField"`
+
+	// +k8s:optional
+	// +default=0
+	IntPtrField *int `json:"intPtrField"`
+
+	// +k8s:optional
+	// +default=false
+	BoolField bool `json:"boolField"`
+
+	// +k8s:optional
+	// +default=false
+	BoolPtrField *bool `json:"boolPtrField"`
+}

staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/optional/zero_defaults/doc.go

@@ -0,0 +1,47 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package zerodefaults
+
+import (
+	"testing"
+
+	"k8s.io/utils/ptr"
+)
+
+func Test(t *testing.T) {
+	st := localSchemeBuilder.Test(t)
+
+	st.Value(&Struct{
+		// All zero-values.
+	}).ExpectRegexpsByPath(map[string][]string{
+		// "stringField": optional value fields with zero defaults are just docs
+		// "intField": optional value fields with zero defaults are just docs
+		// "boolField": optional value fields with zero defaults are just docs
+		"stringPtrField": {"Required value"},
+		"intPtrField":    {"Required value"},
+		"boolPtrField":   {"Required value"},
+	})
+
+	st.Value(&Struct{
+		StringField:    "abc",
+		StringPtrField: ptr.To(""),
+		IntField:       123,
+		IntPtrField:    ptr.To(0),
+		BoolField:      true,
+		BoolPtrField:   ptr.To(false),
+	}).ExpectValid()
+}