fix(openapi): support any type for additionalProperties

JsonSchema "additionalProperties" is a union type of a
boolean and an object. Adding the ability to support
both.

Author: toumorokoshi

pkg/api/api.go

@@ -89,7 +89,7 @@ func GetAPI(api *openapi.OpenAPI, serverURL, pathPrefix string) (*API, error) {
 			}
 			if pathItem.Get != nil {
 				if resp, ok := pathItem.Get.Responses["200"]; ok {
-					lroDetails = pathItem.Post.XAEPLongRunningOperation
+					lroDetails = pathItem.Get.XAEPLongRunningOperation
 					schema := api.GetSchemaFromResponse(resp, openapi.APPLICATION_JSON)
 					responseSchema := &openapi.Schema{}
 					if lroDetails != nil {

pkg/api/operation.go

@@ -1,37 +1,47 @@
 package api
 
-import "github.com/aep-dev/aep-lib-go/pkg/openapi"
+import (
+	"encoding/json"
 
-var OperationSchema = openapi.Schema{
-	Type:                 "object",
-	XAEPProtoMessageName: "aep.api.Operation",
-	Required: []string{
-		"name",
-		"done",
-	},
-	Properties: map[string]openapi.Schema{
-		"path": {
-			Type:        "string",
-			Description: "The server-assigned path of the operation, which is unique within the service.",
-		},
-		"metadata": {
-			Type:                 "object",
-			Description:          "Service-specific metadata associated with the operation.",
-			AdditionalProperties: true,
-		},
-		"done": {
-			Type:        "boolean",
-			Description: "If the value is false, it means the operation is still in progress. If true, the operation is completed.",
-		},
-		"error": {
-			Ref: "https://aep.dev/json-schema/type/problems.json",
+	"github.com/aep-dev/aep-lib-go/pkg/openapi"
+)
+
+var additionalPropertiesTrue = json.RawMessage([]byte("true"))
+
+func OperationSchema() openapi.Schema {
+	// jsonString := `true`
+	// additionalPropertiesTrue := json.RawMessage([]byte(jsonString))
+	return openapi.Schema{
+		Type:                 "object",
+		XAEPProtoMessageName: "aep.api.Operation",
+		Required: []string{
+			"name",
+			"done",
 		},
-		"response": {
-			Type:                 "object",
-			Description:          "The normal response of the operation in case of success.",
-			AdditionalProperties: true,
+		Properties: map[string]openapi.Schema{
+			"path": {
+				Type:        "string",
+				Description: "The server-assigned path of the operation, which is unique within the service.",
+			},
+			"metadata": {
+				Type:                 "object",
+				Description:          "Service-specific metadata associated with the operation.",
+				AdditionalProperties: additionalPropertiesTrue,
+			},
+			"done": {
+				Type:        "boolean",
+				Description: "If the value is false, it means the operation is still in progress. If true, the operation is completed.",
+			},
+			"error": {
+				Ref: "https://aep.dev/json-schema/type/problems.json",
+			},
+			"response": {
+				Type:                 "object",
+				Description:          "The normal response of the operation in case of success.",
+				AdditionalProperties: additionalPropertiesTrue,
+			},
 		},
-	},
+	}
 }
 
 func OperationResourceWithDefaults() *Resource {
@@ -42,10 +52,11 @@ func OperationResourceWithDefaults() *Resource {
 
 // Return a longrunningoperation resource
 func OperationResource(m Methods, cm []*CustomMethod) *Resource {
+	schema := OperationSchema()
 	return &Resource{
 		Singular:      "operation",
 		Plural:        "operations",
-		Schema:        &OperationSchema,
+		Schema:        &schema,
 		Methods:       m,
 		CustomMethods: cm,
 	}

pkg/openapi/openapi.go

@@ -179,13 +179,15 @@ type Schema struct {
 	Ref             string        `json:"$ref,omitempty"`
 	XAEPResource    *XAEPResource `json:"x-aep-resource,omitempty"`
 	XAEPFieldNumber int           `json:"x-aep-field-number,omitempty"`
-	// Documents the name of the proto message to use for generation.
-	// If unset, proto generation will create a proto message for this schema.
+	/// Documents the name of the proto message to use for generation.
+	/// If unset, proto generation will not create a proto message for this schema.
 	XAEPProtoMessageName string   `json:"x-aep-proto-message-name,omitempty"`
 	ReadOnly             bool     `json:"readOnly,omitempty"`
 	Required             []string `json:"required,omitempty"`
 	Description          string   `json:"description,omitempty"`
-	AdditionalProperties bool     `json:"additionalProperties,omitempty"`
+	// AdditionalProperties can be a bool and an object - this allows
+	// handling for both.
+	AdditionalProperties json.RawMessage `json:"additionalProperties,omitempty"`
 }
 
 type Properties map[string]Schema