diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 3be69d41e88..d62f58bc189 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -34956,11 +34956,8 @@ "description": "Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4", "type": "object", "additionalProperties": { - "type": "array", - "items": { - "type": "integer", - "format": "byte" - } + "type": "string", + "format": "byte" } }, "metadata": { diff --git a/cmd/libs/go2idl/openapi-gen/generators/openapi.go b/cmd/libs/go2idl/openapi-gen/generators/openapi.go index ad12815610e..fec9acf78e9 100644 --- a/cmd/libs/go2idl/openapi-gen/generators/openapi.go +++ b/cmd/libs/go2idl/openapi-gen/generators/openapi.go @@ -446,10 +446,15 @@ func (g openAPITypeWriter) generateMapProperty(t *types.Type) error { } g.Do("Type: []string{\"object\"},\n", nil) g.Do("AdditionalProperties: &spec.SchemaOrBool{\nSchema: &spec.Schema{\nSchemaProps: spec.SchemaProps{\n", nil) + typeString, format := common.GetOpenAPITypeFormat(elemType.String()) + if typeString != "" { + g.generateSimpleProperty(typeString, format) + g.Do("},\n},\n},\n", nil) + return nil + } switch elemType.Kind { case types.Builtin: - typeString, format := common.GetOpenAPITypeFormat(elemType.String()) - g.generateSimpleProperty(typeString, format) + return fmt.Errorf("please add type %v to getOpenAPITypeFormat function.", elemType) case types.Struct: g.generateReferenceProperty(t.Elem) case types.Slice, types.Array: @@ -465,10 +470,15 @@ func (g openAPITypeWriter) generateSliceProperty(t *types.Type) error { elemType := resolveAliasAndPtrType(t.Elem) g.Do("Type: []string{\"array\"},\n", nil) g.Do("Items: &spec.SchemaOrArray{\nSchema: &spec.Schema{\nSchemaProps: spec.SchemaProps{\n", nil) + typeString, format := common.GetOpenAPITypeFormat(elemType.String()) + if typeString != "" { + g.generateSimpleProperty(typeString, format) + g.Do("},\n},\n},\n", nil) + return nil + } switch elemType.Kind { case types.Builtin: - typeString, format := common.GetOpenAPITypeFormat(elemType.String()) - g.generateSimpleProperty(typeString, format) + return fmt.Errorf("please add type %v to getOpenAPITypeFormat function.", elemType) case types.Struct: g.generateReferenceProperty(t.Elem) default: diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index acf10e55ddd..108ad12232a 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -9273,11 +9273,8 @@ "description": "Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4", "type": "object", "additionalProperties": { - "type": "array", - "items": { - "type": "integer", - "format": "byte" - } + "type": "string", + "format": "byte" } }, "metadata": { diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 245c859b4de..9d5d56737b5 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -12326,15 +12326,8 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ AdditionalProperties: &spec.SchemaOrBool{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"integer"}, - Format: "byte", - }, - }, - }, + Type: []string{"string"}, + Format: "byte", }, }, },