encoding/openapi: remove Config.All

It has been deprecated since March 2020, and the presence of
OrderedMap in the API is no longer useful and causes us to carry
a significant amount of code forward.

The legacy code around OrderedMap existed to help transition the Istio
project more than four years ago; its use has long expired.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: I9c9a0f58f638a42d8c248c22ede941407baef337
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1201933
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Roger Peppe <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: mvdan

encoding/openapi/openapi.go

@@ -91,18 +91,25 @@ func Gen(inst cue.InstanceOrValue, c *Config) ([]byte, error) {
 	if c == nil {
 		c = defaultConfig
 	}
-	all, err := c.All(inst)
+	all, err := schemas(c, inst)
+	if err != nil {
+		return nil, err
+	}
+	top, err := c.compose(inst, all)
 	if err != nil {
 		return nil, err
 	}
-	return internaljson.Marshal(all)
+	return internaljson.Marshal((*OrderedMap)(top))
 }
 
 // Generate generates the set of OpenAPI schema for all top-level types of the
 // given instance.
 //
 // Note: only a limited number of top-level types are supported so far.
 func Generate(inst cue.InstanceOrValue, c *Config) (*ast.File, error) {
+	if c == nil {
+		c = defaultConfig
+	}
 	all, err := schemas(c, inst)
 	if err != nil {
 		return nil, err
@@ -114,19 +121,6 @@ func Generate(inst cue.InstanceOrValue, c *Config) (*ast.File, error) {
 	return &ast.File{Decls: top.Elts}, nil
 }
 
-// All generates an OpenAPI definition from the given instance.
-//
-// Note: only a limited number of top-level types are supported so far.
-// Deprecated: use Generate
-func (g *Generator) All(inst cue.InstanceOrValue) (*OrderedMap, error) {
-	all, err := schemas(g, inst)
-	if err != nil {
-		return nil, err
-	}
-	top, err := g.compose(inst, all)
-	return (*OrderedMap)(top), err
-}
-
 func toCUE(name string, x interface{}) (v ast.Expr, err error) {
 	b, err := internaljson.Marshal(x)
 	if err == nil {

encoding/openapi/openapi_test.go

@@ -191,11 +191,10 @@ func TestParseDefinitions(t *testing.T) {
 				if tc.err != "" {
 					t.Fatal("unexpected success:", tc.err)
 				} else {
-					all, err := tc.config.All(inst)
+					_, err := openapi.Generate(inst, tc.config)
 					if err != nil {
 						t.Fatal(err)
 					}
-					walk(all)
 				}
 
 				var out = &bytes.Buffer{}
@@ -230,21 +229,6 @@ func TestParseDefinitions(t *testing.T) {
 	}
 }
 
-// walk traverses an openapi.OrderedMap. This is a helper function
-// used to ensure that a generated OpenAPI value is well-formed.
-func walk(om *openapi.OrderedMap) {
-	for _, p := range om.Pairs() {
-		switch p := p.Value.(type) {
-		case *openapi.OrderedMap:
-			walk(p)
-		case []*openapi.OrderedMap:
-			for _, om := range p {
-				walk(om)
-			}
-		}
-	}
-}
-
 // TODO: move OpenAPI testing to txtar and allow errors.
 func TestIssue1234(t *testing.T) {
 	val := cuecontext.New().CompileString(`