fixes

Author: andreaangiolillo

tools/cli/internal/openapi/filter/schemas.go

@@ -15,12 +15,14 @@
 package filter
 
 import (
+	"log"
+	"maps"
 	"strings"
 
 	"github.com/getkin/kin-openapi/openapi3"
 )
 
-// SchemasFilter removes schemas that are not used in operations.
+// SchemasFilter removes unused #/components/schemas/.
 type SchemasFilter struct {
 	oas *openapi3.T
 }
@@ -34,126 +36,26 @@ func (f *SchemasFilter) Apply() error {
 		return nil
 	}
 
-	usedRefs := map[string]bool{}
-	allRefs := findRefs(f.oas)
-
-	// Extract unique references used in the OpenAPI document
-	for ref := range allRefs {
-		refParts := strings.Split(ref, "/")
-		if len(refParts) >= 4 && refParts[1] == "components" && refParts[2] == "schemas" {
-			usedRefs[refParts[3]] = true
-		}
-	}
-
-	//res2B, _ := json.Marshal(usedRefs)
-	//fmt.Println("ANDREA:")
-	//fmt.Println(string(res2B))
-
-	filterComponentSchemasInRefs(f.oas, usedRefs)
-	return nil
-}
-
-// findRefs returns all the ref included in an openapi spec.
-func findRefs(oas *openapi3.T) map[string]bool {
-	if oas == nil {
-		return nil
-	}
-
-	refs := map[string]bool{}
-	for _, v := range oas.Paths.Map() {
-		refs[v.Ref] = true
-		for _, op := range v.Operations() {
-			for _, param := range op.Parameters {
-				refs[param.Ref] = true
-				if param.Value == nil {
-					continue
-				}
-				findRefsSchemaRef(refs, param.Value.Schema)
-			}
-
-			if op.RequestBody != nil {
-				refs[op.RequestBody.Ref] = true
-				if op.RequestBody.Value != nil {
-					for _, content := range op.RequestBody.Value.Content {
-						if content.Schema != nil {
-							findRefsSchemaRef(refs, content.Schema)
-						}
-					}
-				}
-			}
-
-			for _, resp := range op.Responses.Map() {
-				refs[resp.Ref] = true
-				if resp.Value == nil {
-					continue
-				}
-				for _, content := range resp.Value.Content {
-					if content.Schema != nil {
-						findRefsSchemaRef(refs, content.Schema)
-					}
-				}
-			}
-		}
-	}
-
-	return refs
-}
-
-func findRefsSchemasRefs(refs map[string]bool, schemas openapi3.SchemaRefs) {
-	if schemas == nil {
-		return
-	}
-
-	for _, schema := range schemas {
-		if ok := refs[schema.Ref]; ok {
-			continue
-		}
-
-		refs[schema.Ref] = true
-		if schema.Value != nil {
-			findRefsSchemasRefs(refs, schema.Value.AllOf)
-			findRefsSchemasRefs(refs, schema.Value.OneOf)
-			findRefsSchemasRefs(refs, schema.Value.AnyOf)
-			findRefsSchemas(refs, schema.Value.Properties)
-		}
-	}
-}
-
-func findRefsSchemas(refs map[string]bool, schemas openapi3.Schemas) {
-	if schemas == nil {
-		return
-	}
-
-	for _, schema := range schemas {
-		findRefsSchemaRef(refs, schema)
-	}
-}
-
-func findRefsSchemaRef(refs map[string]bool, schema *openapi3.SchemaRef) {
-	if schema == nil {
-		return
-	}
-
-	refs[schema.Ref] = true
-	if schema.Value == nil {
-		return
+	schemasToDelete := make([]string, 0)
+	oasSpecAsBytes, err := f.oas.MarshalJSON()
+	if err != nil {
+		return err
 	}
 
-	findRefsSchemasRefs(refs, schema.Value.AllOf)
-	findRefsSchemasRefs(refs, schema.Value.OneOf)
-	findRefsSchemasRefs(refs, schema.Value.AnyOf)
-}
-
-func filterComponentSchemasInRefs(oas *openapi3.T, usedRefs map[string]bool) {
-	schemasToDelete := make([]string, 0)
-	for k, _ := range oas.Components.Schemas {
-		//fmt.Printf("k: %s, v: %v", k, v)
-		if ok := usedRefs[k]; !ok {
+	spec := string(oasSpecAsBytes)
+	for k := range f.oas.Components.Schemas {
+		ref := "#/components/schemas/" + k
+		if !strings.Contains(spec, ref) {
 			schemasToDelete = append(schemasToDelete, k)
 		}
 	}
 
 	for _, schemaToDelete := range schemasToDelete {
-		delete(oas.Components.Schemas, schemaToDelete)
+		log.Printf("Deleting unused schema: '%s'", schemaToDelete)
+		maps.DeleteFunc(f.oas.Components.Schemas, func(k string, _ *openapi3.SchemaRef) bool {
+			return k == schemaToDelete
+		})
 	}
+
+	return nil
 }

tools/cli/internal/openapi/openapi.go

@@ -49,7 +49,6 @@ func (o *OasDiff) MergeOpenAPISpecs(paths []string) (*Spec, error) {
 		if err != nil {
 			return nil, err
 		}
-
 		o.result, err = o.GetSimpleDiff(o.base, spec)
 		if err != nil {
 			log.Fatalf("error in calculating the diff of the specs: %s", err)