sdg0919
diff --git a/‎Makefile
Lines changed: 5 additions & 2 deletions b/‎Makefile
Lines changed: 5 additions & 2 deletions
diff --git a/‎cmd/juju/commands/describeapi.go
Lines changed: 8 additions & 72 deletions b/‎cmd/juju/commands/describeapi.go
Lines changed: 8 additions & 72 deletions
@@ -58,7 +58,7 @@ dep: $(GOPATH)/bin/dep
 	$(GOPATH)/bin/dep ensure -vendor-only $(verbose)
 endif
 
-build: dep go-build
+build: dep rebuild-schema go-build
 
 release-build: dep go-build
 
@@ -73,7 +73,7 @@ check: dep pre-check test
 test: dep
 	go test $(CHECK_ARGS) -test.timeout=$(TEST_TIMEOUT) $(PROJECT_PACKAGES) -check.v
 
-install: dep go-install
+install: dep rebuild-schema go-install
 
 clean:
 	go clean -n -r --cache --testcache $(PROJECT_PACKAGES)
@@ -114,6 +114,9 @@ simplify:
 rebuild-dependencies:
 	dep ensure -v -no-vendor $(dep-update)
 
+rebuild-schema:
+	go generate ./cmd/juju/commands/describeapi.go
+
 # Install packages required to develop Juju and run tests. The stable
 # PPA includes the required mongodb-server binaries.
 install-dependencies:
 
@@ -4,42 +4,24 @@
 package commands
 
 import (
-	"reflect"
-
-	"github.com/bcsaller/jsonschema"
 	"github.com/juju/cmd"
-	"github.com/juju/errors"
 	"github.com/juju/gnuflag"
 
-	"github.com/juju/juju/apiserver"
-	"github.com/juju/juju/apiserver/facade"
 	jujucmd "github.com/juju/juju/cmd"
 	"github.com/juju/juju/cmd/modelcmd"
-	"github.com/juju/juju/cmd/output"
-	"github.com/juju/juju/rpc/rpcreflect"
 )
 
+//go:generate go run ../../../generate/schemagen/schemagen.go allFacadesSchema commands describeapi_schemagen.go
+
 // newDescribeAPICommand returns a full description of the api-servers
 // AllFacades information as a JSON schema.
 func newDescribeAPICommon() cmd.Command {
-	return modelcmd.Wrap(&describeAPICommand{})
-}
-
-//go:generate mockgen -package commands -destination describeapi_mock.go github.com/juju/juju/cmd/juju/commands APIServer,Registry
-type APIServer interface {
-	AllFacades() Registry
-	Close() error
-}
-
-type Registry interface {
-	List() []facade.Description
-	GetType(name string, version int) (reflect.Type, error)
+	return &describeAPICommand{}
 }
 
 type describeAPICommand struct {
-	modelcmd.ModelCommandBase
-	out       cmd.Output
-	apiServer APIServer
+	modelcmd.CommandBase
+	out cmd.Output
 }
 
 const describeAPIHelpDoc = `
@@ -62,8 +44,7 @@ func (c *describeAPICommand) Info() *cmd.Info {
 
 // SetFlags implements Command.
 func (c *describeAPICommand) SetFlags(f *gnuflag.FlagSet) {
-	c.ModelCommandBase.SetFlags(f)
-	c.out.AddFlags(f, "json", output.DefaultFormatters)
+	c.CommandBase.SetFlags(f)
 }
 
 // Init implements Command.
@@ -73,51 +54,6 @@ func (c *describeAPICommand) Init(args []string) error {
 
 // Run implements Command.
 func (c *describeAPICommand) Run(ctx *cmd.Context) error {
-	client, err := c.getAPI()
-	if err != nil {
-		return errors.Trace(err)
-	}
-	defer client.Close()
-
-	registry := client.AllFacades()
-	facades := registry.List()
-	result := make([]FacadeSchema, len(facades))
-	for i, facade := range facades {
-		// select the latest version from the facade list
-		version := facade.Versions[len(facade.Versions)-1]
-
-		result[i].Name = facade.Name
-		result[i].Version = version
-
-		kind, err := registry.GetType(facade.Name, version)
-		if err != nil {
-			return errors.Annotatef(err, "getting type for facade %s at version %d", facade.Name, version)
-		}
-		objType := rpcreflect.ObjTypeOf(kind)
-		result[i].Schema = jsonschema.ReflectFromObjType(objType)
-	}
-	return c.out.Write(ctx, result)
-}
-
-func (c *describeAPICommand) getAPI() (APIServer, error) {
-	if c.apiServer != nil {
-		return c.apiServer, nil
-	}
-	return apiServerShim{}, nil
-}
-
-type FacadeSchema struct {
-	Name    string
-	Version int
-	Schema  *jsonschema.Schema
-}
-
-type apiServerShim struct{}
-
-func (apiServerShim) AllFacades() Registry {
-	return apiserver.AllFacades()
-}
-
-func (apiServerShim) Close() error {
-	return nil
+	_, err := ctx.Stdout.Write([]byte(allFacadesSchema))
+	return err
 }