Fix #4614 Unique Items placement (#4619)

* fix: unique items location * updated template_test + corrected UniqueItems type
grpc-ecosystem · Aug 12, 2024 · 0d3c6d6 · 0d3c6d6
1 parent 9cf3e9f
commit 0d3c6d6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/protoc-gen-openapiv2/internal/genopenapi/template.go b/protoc-gen-openapiv2/internal/genopenapi/template.go
@@ -349,6 +349,7 @@ func nestedQueryParams(message *descriptor.Message, field *descriptor.Field, pre
 			Format:      schema.Format,
 			Pattern:     schema.Pattern,
 			Required:    required,
+			UniqueItems: schema.UniqueItems,
 			extensions:  schema.extensions,
 			Enum:        schema.Enum,
 		}
@@ -2936,7 +2937,6 @@ func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_option
 		s.Items.MinLength = j.GetMinLength()
 		s.Items.Pattern = j.GetPattern()
 		s.Items.Default = j.GetDefault()
-		s.Items.UniqueItems = j.GetUniqueItems()
 		s.Items.MaxProperties = j.GetMaxProperties()
 		s.Items.MinProperties = j.GetMinProperties()
 		s.Items.Required = j.GetRequired()
@@ -2962,7 +2962,6 @@ func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_option
 		s.MinLength = j.GetMinLength()
 		s.Pattern = j.GetPattern()
 		s.Default = j.GetDefault()
-		s.UniqueItems = j.GetUniqueItems()
 		s.MaxProperties = j.GetMaxProperties()
 		s.MinProperties = j.GetMinProperties()
 		s.Required = j.GetRequired()
@@ -2984,6 +2983,7 @@ func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_option
 			s.Format = j.GetFormat()
 		}
 	}
+	s.UniqueItems = j.GetUniqueItems()
 	s.MaxItems = j.GetMaxItems()
 	s.MinItems = j.GetMinItems()
 

diff --git a/protoc-gen-openapiv2/internal/genopenapi/template_test.go b/protoc-gen-openapiv2/internal/genopenapi/template_test.go
@@ -4973,7 +4973,6 @@ func TestSchemaOfField(t *testing.T) {
 						MaxLength:        10,
 						MinLength:        3,
 						Pattern:          "[a-z]+",
-						UniqueItems:      true,
 						MaxProperties:    33,
 						MinProperties:    22,
 						Required:         []string{"req"},
@@ -4982,6 +4981,7 @@ func TestSchemaOfField(t *testing.T) {
 				},
 				Title:       "field title",
 				Description: "field description",
+				UniqueItems: true,
 				MaxItems:    20,
 				MinItems:    2,
 			},
@@ -5019,7 +5019,6 @@ func TestSchemaOfField(t *testing.T) {
 						MaxLength:        10,
 						MinLength:        3,
 						Pattern:          "[a-z]+",
-						UniqueItems:      true,
 						MaxProperties:    33,
 						MinProperties:    22,
 						Required:         []string{"req"},
@@ -5028,6 +5027,7 @@ func TestSchemaOfField(t *testing.T) {
 				},
 				Title:       "field title",
 				Description: "field description",
+				UniqueItems: true,
 				MaxItems:    20,
 				MinItems:    2,
 			},

diff --git a/protoc-gen-openapiv2/internal/genopenapi/types.go b/protoc-gen-openapiv2/internal/genopenapi/types.go
@@ -151,6 +151,7 @@ type openapiParameterObject struct {
 	Required         bool                `json:"required" yaml:"required"`
 	Type             string              `json:"type,omitempty" yaml:"type,omitempty"`
 	Format           string              `json:"format,omitempty" yaml:"format,omitempty"`
+	UniqueItems      bool                `json:"uniqueItems,omitempty" yaml:"uniqueItems,omitempty"`
 	Items            *openapiItemsObject `json:"items,omitempty" yaml:"items,omitempty"`
 	Enum             interface{}         `json:"enum,omitempty" yaml:"enum,omitempty"`
 	CollectionFormat string              `json:"collectionFormat,omitempty" yaml:"collectionFormat,omitempty"`