fix preserving required fields from previous plugins (#2994)

Author: s-urbaniak

tools/openapi2crd/pkg/plugins/read_write_properties.go

@@ -39,11 +39,13 @@ func (p *ReadWriteProperties) Process(req *PropertyProcessorRequest) error {
 	}
 
 	required := sets.New(req.OpenAPISchema.Required...)
+	required.Insert(req.Property.Required...)
 	for name, prop := range req.OpenAPISchema.Properties {
 		if prop.Value.ReadOnly {
 			required.Delete(name)
 		}
 	}
+
 	req.Property.Required = required.UnsortedList()
 	slices.Sort(req.Property.Required)
 

tools/openapi2crd/pkg/plugins/read_write_properties_test.go

@@ -19,10 +19,9 @@ import (
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd/pkg/apis/config/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-
-	"github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd/pkg/apis/config/v1alpha1"
 )
 
 func TestReadWritePropertyName(t *testing.T) {

…i2crd/pkg/plugins/sesitive_properties.go …2crd/pkg/plugins/sensitive_properties.gotools/openapi2crd/pkg/plugins/sesitive_properties.go renamed to tools/openapi2crd/pkg/plugins/sensitive_properties.go tools/openapi2crd/pkg/plugins/sesitive_properties.go renamed to tools/openapi2crd/pkg/plugins/sensitive_properties.go

@@ -19,10 +19,9 @@ import (
 	"fmt"
 	"strings"
 
+	configv1alpha1 "github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd/pkg/apis/config/v1alpha1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-
-	configv1alpha1 "github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd/pkg/apis/config/v1alpha1"
 )
 
 type SensitiveProperties struct{}
@@ -71,6 +70,7 @@ func (p *SensitiveProperties) Process(req *PropertyProcessorRequest) error {
 			Description: fmt.Sprintf(`Key of the secret data containing the sensitive field value, defaults to %q.`, req.Path[len(req.Path)-1]),
 		},
 	}
+	req.Property.Required = []string{"name"}
 
 	return nil
 }

…/pkg/plugins/sesitive_properties_test.go …pkg/plugins/sensitive_properties_test.gotools/openapi2crd/pkg/plugins/sesitive_properties_test.go renamed to tools/openapi2crd/pkg/plugins/sensitive_properties_test.go tools/openapi2crd/pkg/plugins/sesitive_properties_test.go renamed to tools/openapi2crd/pkg/plugins/sensitive_properties_test.go

@@ -19,11 +19,10 @@ import (
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi3"
+	configv1alpha1 "github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd/pkg/apis/config/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-
-	configv1alpha1 "github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd/pkg/apis/config/v1alpha1"
 )
 
 func TestSensitivePropertyName(t *testing.T) {
@@ -70,6 +69,7 @@ func TestSensitivePropertyProcess(t *testing.T) {
 				ID:          "passwordSecretRef",
 				Type:        "object",
 				Description: "SENSITIVE FIELD\n\nReference to a secret containing data for the \"password\" field:\n\nthe password",
+				Required:    []string{"name"},
 				Properties: map[string]apiextensions.JSONSchemaProps{
 					"name": {
 						Type:        "string",
@@ -120,6 +120,7 @@ func TestSensitivePropertyProcess(t *testing.T) {
 				ID:          "passwordSecretRef",
 				Type:        "object",
 				Description: "SENSITIVE FIELD\n\nReference to a secret containing data for the \"password\" field:\n\nthe credentials password",
+				Required:    []string{"name"},
 				Properties: map[string]apiextensions.JSONSchemaProps{
 					"name": {
 						Type:        "string",

tools/openapi2crd/pkg/plugins/skipped_properties.go

@@ -39,6 +39,10 @@ func (p *SkippedProperties) Process(req *PropertyProcessorRequest) error {
 		requiredPaths[jsonPath(append(req.Path, r))] = r
 	}
 
+	for _, r := range req.Property.Required {
+		requiredPaths[jsonPath(append(req.Path, r))] = r
+	}
+
 	for _, s := range req.PropertyConfig.Filters.SkipProperties {
 		delete(requiredPaths, s)
 	}