improve plugins names

helderjs · helderjs · commit b1b96b7754d6 · 2025-09-29T19:09:03.000+02:00
diff --git a/tools/openapi2crd/config.yaml b/tools/openapi2crd/config.yaml
@@ -23,15 +23,15 @@ spec:
       plugins:
         - base
         - major_version
-        - parameter
+        - parameters
         - entry
         - status
-        - sensitive_property
-        - skipped_property
-        - read_only_property
-        - read_write_property
-        - reference
-        - reference_metadata
+        - sensitive_properties
+        - skipped_properties
+        - read_only_properties
+        - read_write_properties
+        - references
+        - references_metadata
         - mutual_exclusive_major_versions
         - atlas_sdk_version
 
diff --git a/tools/openapi2crd/pkg/plugins/catalog.go b/tools/openapi2crd/pkg/plugins/catalog.go
@@ -122,20 +122,20 @@ func NewCatalog() *Catalog {
 		},
 		mapping: map[string]MappingPlugin{
 			"major_version": &MajorVersion{},
-			"parameter":     &Parameter{},
+			"parameters":    &Parameters{},
 			"entry":         &Entry{},
 			"status":        &Status{},
-			"reference":     &Reference{},
+			"references":    &References{},
 		},
 		property: map[string]PropertyPlugin{
-			"sensitive_property":  &SensitiveProperty{},
-			"skipped_property":    &SkippedProperty{},
-			"read_only_property":  &ReadOnlyProperty{},
-			"read_write_property": &ReadWriteProperty{},
+			"sensitive_properties":  &SensitiveProperties{},
+			"skipped_properties":    &SkippedProperties{},
+			"read_only_properties":  &ReadOnlyProperties{},
+			"read_write_properties": &ReadWriteProperties{},
 		},
 		extension: map[string]ExtensionPlugin{
-			"atlas_sdk_version":  &AtlasSdkVersionPlugin{},
-			"reference_metadata": &ReferenceMetadata{},
+			"atlas_sdk_version":   &AtlasSdkVersionPlugin{},
+			"references_metadata": &ReferencesMetadata{},
 		},
 	}
 }
diff --git a/tools/openapi2crd/pkg/plugins/catalog_test.go b/tools/openapi2crd/pkg/plugins/catalog_test.go
@@ -41,8 +41,8 @@ func TestBuildSets(t *testing.T) {
 					Name:      "set-2",
 					Default:   false,
 					CRD:       []CRDPlugin{&Base{}},
-					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &Reference{}},
-					Property:  []PropertyPlugin{&ReadOnlyProperty{}, &ReadWriteProperty{}},
+					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &References{}},
+					Property:  []PropertyPlugin{&ReadOnlyProperties{}, &ReadWriteProperties{}},
 					Extension: []ExtensionPlugin{},
 				},
 			},
@@ -69,15 +69,15 @@ func TestBuildSets(t *testing.T) {
 					CRD:       []CRDPlugin{&Base{}},
 					Mapping:   []MappingPlugin{&Entry{}, &Status{}},
 					Property:  []PropertyPlugin{},
-					Extension: []ExtensionPlugin{&ReferenceMetadata{}},
+					Extension: []ExtensionPlugin{&ReferencesMetadata{}},
 				},
 				{
 					Name:      "set-2",
 					Default:   false,
 					CRD:       []CRDPlugin{&Base{}},
-					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &Reference{}},
-					Property:  []PropertyPlugin{&ReadOnlyProperty{}, &ReadWriteProperty{}},
-					Extension: []ExtensionPlugin{&ReferenceMetadata{}},
+					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &References{}},
+					Property:  []PropertyPlugin{&ReadOnlyProperties{}, &ReadWriteProperties{}},
+					Extension: []ExtensionPlugin{&ReferencesMetadata{}},
 				},
 			},
 			expectedErr: nil,
@@ -153,8 +153,8 @@ func TestGetPluginSet(t *testing.T) {
 					Name:      "set-2",
 					Default:   false,
 					CRD:       []CRDPlugin{&Base{}},
-					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &Reference{}},
-					Property:  []PropertyPlugin{&ReadOnlyProperty{}, &ReadWriteProperty{}},
+					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &References{}},
+					Property:  []PropertyPlugin{&ReadOnlyProperties{}, &ReadWriteProperties{}},
 					Extension: []ExtensionPlugin{},
 				},
 			},
@@ -163,8 +163,8 @@ func TestGetPluginSet(t *testing.T) {
 				Name:      "set-2",
 				Default:   false,
 				CRD:       []CRDPlugin{&Base{}},
-				Mapping:   []MappingPlugin{&Entry{}, &Status{}, &Reference{}},
-				Property:  []PropertyPlugin{&ReadOnlyProperty{}, &ReadWriteProperty{}},
+				Mapping:   []MappingPlugin{&Entry{}, &Status{}, &References{}},
+				Property:  []PropertyPlugin{&ReadOnlyProperties{}, &ReadWriteProperties{}},
 				Extension: []ExtensionPlugin{},
 			},
 			expectedError: nil,
@@ -183,8 +183,8 @@ func TestGetPluginSet(t *testing.T) {
 					Name:      "set-2",
 					Default:   false,
 					CRD:       []CRDPlugin{&Base{}},
-					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &Reference{}},
-					Property:  []PropertyPlugin{&ReadOnlyProperty{}, &ReadWriteProperty{}},
+					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &References{}},
+					Property:  []PropertyPlugin{&ReadOnlyProperties{}, &ReadWriteProperties{}},
 					Extension: []ExtensionPlugin{},
 				},
 			},
@@ -213,8 +213,8 @@ func TestGetPluginSet(t *testing.T) {
 					Name:      "set-2",
 					Default:   false,
 					CRD:       []CRDPlugin{&Base{}},
-					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &Reference{}},
-					Property:  []PropertyPlugin{&ReadOnlyProperty{}, &ReadWriteProperty{}},
+					Mapping:   []MappingPlugin{&Entry{}, &Status{}, &References{}},
+					Property:  []PropertyPlugin{&ReadOnlyProperties{}, &ReadWriteProperties{}},
 					Extension: []ExtensionPlugin{},
 				},
 			},
diff --git a/tools/openapi2crd/pkg/plugins/parameters.go b/tools/openapi2crd/pkg/plugins/parameters.go
@@ -9,15 +9,15 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 )
 
-// Parameter adds parameters from the OpenAPI spec to the CRD schema.
+// Parameters adds parameters from the OpenAPI spec to the CRD schema.
 // It requires base and major version plugins to be run before.
-type Parameter struct{}
+type Parameters struct{}
 
-func (p *Parameter) Name() string {
-	return "parameter"
+func (p *Parameters) Name() string {
+	return "parameters"
 }
 
-func (p *Parameter) Process(req *MappingProcessorRequest) error {
+func (p *Parameters) Process(req *MappingProcessorRequest) error {
 	majorVersionSpec := req.CRD.Spec.Validation.OpenAPIV3Schema.Properties["spec"].Properties[req.MappingConfig.MajorVersion]
 
 	if req.MappingConfig.ParametersMapping.Path.Name != "" {
diff --git a/tools/openapi2crd/pkg/plugins/parameters_test.go b/tools/openapi2crd/pkg/plugins/parameters_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func TestParameterName(t *testing.T) {
-	p := &Parameter{}
+	p := &Parameters{}
 	assert.Equal(t, "parameter", p.Name())
 }
 
@@ -124,7 +124,7 @@ func TestParameterProcess(t *testing.T) {
 	}
 	for name, tt := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := &Parameter{}
+			p := &Parameters{}
 			err := p.Process(tt.request)
 			assert.Equal(t, tt.expectedErr, err)
 			versionSpec := tt.request.CRD.Spec.Validation.OpenAPIV3Schema.Properties["spec"].Properties[tt.request.MappingConfig.MajorVersion]
diff --git a/tools/openapi2crd/pkg/plugins/plugin.go b/tools/openapi2crd/pkg/plugins/plugin.go
@@ -49,12 +49,12 @@ var _ CRDPlugin = &Base{}
 var _ CRDPlugin = &MutualExclusiveMajorVersions{}
 var _ MappingPlugin = &Entry{}
 var _ MappingPlugin = &Status{}
-var _ MappingPlugin = &Parameter{}
-var _ MappingPlugin = &Reference{}
+var _ MappingPlugin = &Parameters{}
+var _ MappingPlugin = &References{}
 var _ MappingPlugin = &MajorVersion{}
-var _ PropertyPlugin = &ReadOnlyProperty{}
-var _ PropertyPlugin = &ReadWriteProperty{}
-var _ PropertyPlugin = &SensitiveProperty{}
-var _ PropertyPlugin = &SkippedProperty{}
+var _ PropertyPlugin = &ReadOnlyProperties{}
+var _ PropertyPlugin = &ReadWriteProperties{}
+var _ PropertyPlugin = &SensitiveProperties{}
+var _ PropertyPlugin = &SkippedProperties{}
 var _ ExtensionPlugin = &AtlasSdkVersionPlugin{}
-var _ ExtensionPlugin = &ReferenceMetadata{}
+var _ ExtensionPlugin = &ReferencesMetadata{}
diff --git a/tools/openapi2crd/pkg/plugins/read_only_properties.go b/tools/openapi2crd/pkg/plugins/read_only_properties.go
@@ -6,13 +6,13 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-type ReadOnlyProperty struct{}
+type ReadOnlyProperties struct{}
 
-func (p *ReadOnlyProperty) Name() string {
-	return "read_only_property"
+func (p *ReadOnlyProperties) Name() string {
+	return "read_only_properties"
 }
 
-func (p *ReadOnlyProperty) Process(req *PropertyProcessorRequest) error {
+func (p *ReadOnlyProperties) Process(req *PropertyProcessorRequest) error {
 	if req.PropertyConfig == nil || !req.PropertyConfig.Filters.ReadOnly {
 		return nil
 	}
diff --git a/tools/openapi2crd/pkg/plugins/read_only_properties_test.go b/tools/openapi2crd/pkg/plugins/read_only_properties_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestReadOnlyPropertyName(t *testing.T) {
-	p := &ReadOnlyProperty{}
+	p := &ReadOnlyProperties{}
 	assert.Equal(t, "read_only_property", p.Name())
 }
 
@@ -127,7 +127,7 @@ func TestReadOnlyPropertyProcess(t *testing.T) {
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := &ReadOnlyProperty{}
+			p := &ReadOnlyProperties{}
 			err := p.Process(test.request)
 			assert.Equal(t, test.expectedError, err)
 			assert.Equal(t, test.expectedProps, test.request.Property)
diff --git a/tools/openapi2crd/pkg/plugins/read_write_properties.go b/tools/openapi2crd/pkg/plugins/read_write_properties.go
@@ -6,13 +6,13 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-type ReadWriteProperty struct{}
+type ReadWriteProperties struct{}
 
-func (p *ReadWriteProperty) Name() string {
+func (p *ReadWriteProperties) Name() string {
 	return "read_write_property"
 }
 
-func (p *ReadWriteProperty) Process(req *PropertyProcessorRequest) error {
+func (p *ReadWriteProperties) Process(req *PropertyProcessorRequest) error {
 	if req.PropertyConfig == nil || !req.PropertyConfig.Filters.ReadWriteOnly {
 		return nil
 	}
diff --git a/tools/openapi2crd/pkg/plugins/read_write_properties_test.go b/tools/openapi2crd/pkg/plugins/read_write_properties_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestReadWritePropertyName(t *testing.T) {
-	p := &ReadWriteProperty{}
+	p := &ReadWriteProperties{}
 	assert.Equal(t, "read_write_property", p.Name())
 }
 
@@ -106,7 +106,7 @@ func TestReadWritePropertyProcess(t *testing.T) {
 	}
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := &ReadWriteProperty{}
+			p := &ReadWriteProperties{}
 			err := p.Process(tc.request)
 			assert.Equal(t, tc.expectedError, err)
 			assert.Equal(t, tc.expectedProps, tc.request.Property)
diff --git a/tools/openapi2crd/pkg/plugins/references.go b/tools/openapi2crd/pkg/plugins/references.go
@@ -10,15 +10,15 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-// Reference adds reference properties to the CRD OpenAPI schema based on the mapping configuration.
+// References adds reference properties to the CRD OpenAPI schema based on the mapping configuration.
 // It requires base and major version schemas to be already processed.
-type Reference struct{}
+type References struct{}
 
-func (r *Reference) Name() string {
+func (r *References) Name() string {
 	return "reference"
 }
 
-func (r *Reference) Process(req *MappingProcessorRequest) error {
+func (r *References) Process(req *MappingProcessorRequest) error {
 	majorVersionSpec := req.CRD.Spec.Validation.OpenAPIV3Schema.Properties["spec"].Properties[req.MappingConfig.MajorVersion]
 
 	for _, ref := range req.MappingConfig.ParametersMapping.References {
diff --git a/tools/openapi2crd/pkg/plugins/references_metadata.go b/tools/openapi2crd/pkg/plugins/references_metadata.go
@@ -6,13 +6,13 @@ import (
 	"github.com/getkin/kin-openapi/openapi3"
 )
 
-type ReferenceMetadata struct{}
+type ReferencesMetadata struct{}
 
-func (r *ReferenceMetadata) Name() string {
+func (r *ReferencesMetadata) Name() string {
 	return "reference_metadata"
 }
 
-func (r *ReferenceMetadata) Process(req *ExtensionProcessorRequest) error {
+func (r *ReferencesMetadata) Process(req *ExtensionProcessorRequest) error {
 	for _, ref := range req.MappingConfig.ParametersMapping.References {
 		if len(ref.Target.Properties) == 0 {
 			return errors.New("reference target must have at least one property defined")
diff --git a/tools/openapi2crd/pkg/plugins/references_metadata_test.go b/tools/openapi2crd/pkg/plugins/references_metadata_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestReferenceMetadataName(t *testing.T) {
-	p := &ReferenceMetadata{}
+	p := &ReferencesMetadata{}
 	assert.Equal(t, "reference_metadata", p.Name())
 }
 
@@ -151,7 +151,7 @@ func TestReferenceMetadataProcess(t *testing.T) {
 	}
 	for name, tt := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := &ReferenceMetadata{}
+			p := &ReferencesMetadata{}
 			err := p.Process(tt.request)
 			assert.Equal(t, tt.expectedErr, err)
 			if tt.expectedExtensions != nil {
diff --git a/tools/openapi2crd/pkg/plugins/references_test.go b/tools/openapi2crd/pkg/plugins/references_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestReferenceName(t *testing.T) {
-	p := &Reference{}
+	p := &References{}
 	assert.Equal(t, "reference", p.Name())
 }
 
@@ -66,7 +66,7 @@ func TestReferenceProcess(t *testing.T) {
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := &Reference{}
+			p := &References{}
 			err := p.Process(test.request)
 			assert.Equal(t, test.expectedError, err)
 			spec := test.request.CRD.Spec.Validation.OpenAPIV3Schema.Properties["spec"].Properties[test.request.MappingConfig.MajorVersion]
diff --git a/tools/openapi2crd/pkg/plugins/sesitive_properties.go b/tools/openapi2crd/pkg/plugins/sesitive_properties.go
@@ -10,13 +10,13 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 )
 
-type SensitiveProperty struct{}
+type SensitiveProperties struct{}
 
-func (p *SensitiveProperty) Name() string {
+func (p *SensitiveProperties) Name() string {
 	return "sensitive_property"
 }
 
-func (p *SensitiveProperty) Process(req *PropertyProcessorRequest) error {
+func (p *SensitiveProperties) Process(req *PropertyProcessorRequest) error {
 	if !isSensitiveField(req.Path, req.PropertyConfig) {
 		return nil
 	}
diff --git a/tools/openapi2crd/pkg/plugins/sesitive_properties_test.go b/tools/openapi2crd/pkg/plugins/sesitive_properties_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestSensitivePropertyName(t *testing.T) {
-	p := &SensitiveProperty{}
+	p := &SensitiveProperties{}
 	assert.Equal(t, "sensitive_property", p.Name())
 }
 
@@ -138,7 +138,7 @@ func TestSensitivePropertyProcess(t *testing.T) {
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := &SensitiveProperty{}
+			p := &SensitiveProperties{}
 			err := p.Process(test.request)
 			assert.Equal(t, test.expectedError, err)
 			assert.Equal(t, test.expectedProps, test.request.Property)
diff --git a/tools/openapi2crd/pkg/plugins/skipped_properties.go b/tools/openapi2crd/pkg/plugins/skipped_properties.go
@@ -6,13 +6,13 @@ import (
 	configv1alpha1 "tools/openapi2crd/pkg/apis/config/v1alpha1"
 )
 
-type SkippedProperty struct{}
+type SkippedProperties struct{}
 
-func (p *SkippedProperty) Name() string {
+func (p *SkippedProperties) Name() string {
 	return "skipped_property"
 }
 
-func (p *SkippedProperty) Process(req *PropertyProcessorRequest) error {
+func (p *SkippedProperties) Process(req *PropertyProcessorRequest) error {
 	if isSkippedField(req.Path, req.PropertyConfig) {
 		req.Property = nil
 
diff --git a/tools/openapi2crd/pkg/plugins/skipped_properties_test.go b/tools/openapi2crd/pkg/plugins/skipped_properties_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestSkippedPropertyName(t *testing.T) {
-	p := &SkippedProperty{}
+	p := &SkippedProperties{}
 	assert.Equal(t, "skipped_property", p.Name())
 }
 
@@ -147,7 +147,7 @@ func TestSkippedPropertyProcess(t *testing.T) {
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			p := &SkippedProperty{}
+			p := &SkippedProperties{}
 			err := p.Process(test.request)
 			assert.Equal(t, test.expectedError, err)
 			assert.Equal(t, test.expectedProps, test.request.Property)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func TestParameterName(t *testing.T) {`
`18`		`- p := &Parameter{}`
	`18`	`+ p := &Parameters{}`
`19`	`19`	`assert.Equal(t, "parameter", p.Name())`
`20`	`20`	`}`
`21`	`21`
`@@ -124,7 +124,7 @@ func TestParameterProcess(t *testing.T) {`
`124`	`124`	`}`
`125`	`125`	`for name, tt := range tests {`
`126`	`126`	`t.Run(name, func(t *testing.T) {`
`127`		`- p := &Parameter{}`
	`127`	`+ p := &Parameters{}`
`128`	`128`	`err := p.Process(tt.request)`
`129`	`129`	`assert.Equal(t, tt.expectedErr, err)`
`130`	`130`	`versionSpec := tt.request.CRD.Spec.Validation.OpenAPIV3Schema.Properties["spec"].Properties[tt.request.MappingConfig.MajorVersion]`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@ import (`
`6`	`6`	`"k8s.io/apimachinery/pkg/util/sets"`
`7`	`7`	`)`
`8`	`8`
`9`		`-type ReadOnlyProperty struct{}`
	`9`	`+type ReadOnlyProperties struct{}`
`10`	`10`
`11`		`-func (p *ReadOnlyProperty) Name() string {`
`12`		`- return "read_only_property"`
	`11`	`+func (p *ReadOnlyProperties) Name() string {`
	`12`	`+ return "read_only_properties"`
`13`	`13`	`}`
`14`	`14`
`15`		`-func (p ReadOnlyProperty) Process(req PropertyProcessorRequest) error {`
	`15`	`+func (p ReadOnlyProperties) Process(req PropertyProcessorRequest) error {`
`16`	`16`	`if req.PropertyConfig == nil \|\| !req.PropertyConfig.Filters.ReadOnly {`
`17`	`17`	`return nil`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func TestReadOnlyPropertyName(t *testing.T) {`
`13`		`- p := &ReadOnlyProperty{}`
	`13`	`+ p := &ReadOnlyProperties{}`
`14`	`14`	`assert.Equal(t, "read_only_property", p.Name())`
`15`	`15`	`}`
`16`	`16`
`@@ -127,7 +127,7 @@ func TestReadOnlyPropertyProcess(t *testing.T) {`
`127`	`127`	`}`
`128`	`128`	`for name, test := range tests {`
`129`	`129`	`t.Run(name, func(t *testing.T) {`
`130`		`- p := &ReadOnlyProperty{}`
	`130`	`+ p := &ReadOnlyProperties{}`
`131`	`131`	`err := p.Process(test.request)`
`132`	`132`	`assert.Equal(t, test.expectedError, err)`
`133`	`133`	`assert.Equal(t, test.expectedProps, test.request.Property)`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@ import (`
`6`	`6`	`"k8s.io/apimachinery/pkg/util/sets"`
`7`	`7`	`)`
`8`	`8`
`9`		`-type ReadWriteProperty struct{}`
	`9`	`+type ReadWriteProperties struct{}`
`10`	`10`
`11`		`-func (p *ReadWriteProperty) Name() string {`
	`11`	`+func (p *ReadWriteProperties) Name() string {`
`12`	`12`	`return "read_write_property"`
`13`	`13`	`}`
`14`	`14`
`15`		`-func (p ReadWriteProperty) Process(req PropertyProcessorRequest) error {`
	`15`	`+func (p ReadWriteProperties) Process(req PropertyProcessorRequest) error {`
`16`	`16`	`if req.PropertyConfig == nil \|\| !req.PropertyConfig.Filters.ReadWriteOnly {`
`17`	`17`	`return nil`
`18`	`18`	`}`