Merge the apg generated CLI into the registry tool. (#542)

Makefile

@@ -10,13 +10,9 @@ ifeq (, $(shell which protoc))
 endif
 
 all: protos
-	./tools/GENERATE-APG.sh
+	./tools/GENERATE-CLI.sh
 	go install ./...
 
-apg: protoc
-	./tools/GENERATE-APG.sh
-	go install ./cmd/apg
-
 protos: protoc
 	./tools/GENERATE-RPC.sh
 	./tools/GENERATE-GRPC.sh

cmd/registry/cmd/root.go

@@ -29,6 +29,9 @@ import (
 	"github.com/apigee/registry/cmd/registry/cmd/resolve"
 	"github.com/apigee/registry/cmd/registry/cmd/upload"
 	"github.com/apigee/registry/cmd/registry/cmd/vocabulary"
+
+	"github.com/apigee/registry/cmd/registry/cmd/rpc"
+
 	"github.com/spf13/cobra"
 )
 
@@ -57,6 +60,23 @@ func Command() *cobra.Command {
 	cmd.AddCommand(list.Command())
 	cmd.AddCommand(upload.Command())
 	cmd.AddCommand(vocabulary.Command())
+	cmd.AddCommand(RPCCommand())
+	return cmd
+}
+
+func RPCCommand() *cobra.Command {
+	cmd := rpc.RegistryServiceCmd
+	cmd.Use = "rpc"
+	cmd.Short = "Make direct calls to RPC methods"
+	cmd.Long = cmd.Short
+	cmd.PersistentFlags().BoolVarP(&rpc.Verbose, "verbose", "v", false, "Print verbose output")
+	cmd.PersistentFlags().BoolVarP(&rpc.OutputJSON, "json", "j", false, "Print JSON output")
+
+	rpc.AdminServiceCmd.Use = "admin"
+	rpc.AdminServiceCmd.Short = "Make direct calls to Admin RPC methods (self-hosted installations only)"
+	rpc.AdminServiceCmd.Long = rpc.AdminServiceCmd.Short
+	rpc.AdminServiceCmd.Hidden = true
+	cmd.AddCommand(rpc.AdminServiceCmd)
 
 	return cmd
 }

cmd/registry/cmd/rpc/README.md

@@ -0,0 +1,2 @@
+The files in this directory are automatically generated by
+[tools/GENERATE-CLI](/tools/GENERATE-CLI.sh).

cmd/apg/admin_service.go → cmd/registry/cmd/rpc/admin_service.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"fmt"
@@ -34,21 +34,6 @@ func init() {
 	AdminConfig.SetEnvPrefix("APG_REGISTRY")
 	AdminConfig.AutomaticEnv()
 
-	AdminServiceCmd.PersistentFlags().Bool("insecure", false, "Make insecure client connection. Or use APG_REGISTRY_INSECURE. Must be used with \"address\" option")
-	AdminConfig.BindPFlag("insecure", AdminServiceCmd.PersistentFlags().Lookup("insecure"))
-	AdminConfig.BindEnv("insecure")
-
-	AdminServiceCmd.PersistentFlags().String("address", "", "Set API address used by client. Or use APG_REGISTRY_ADDRESS.")
-	AdminConfig.BindPFlag("address", AdminServiceCmd.PersistentFlags().Lookup("address"))
-	AdminConfig.BindEnv("address")
-
-	AdminServiceCmd.PersistentFlags().String("token", "", "Set Bearer token used by the client. Or use APG_REGISTRY_TOKEN.")
-	AdminConfig.BindPFlag("token", AdminServiceCmd.PersistentFlags().Lookup("token"))
-	AdminConfig.BindEnv("token")
-
-	AdminServiceCmd.PersistentFlags().String("api_key", "", "Set API Key used by the client. Or use APG_REGISTRY_API_KEY.")
-	AdminConfig.BindPFlag("api_key", AdminServiceCmd.PersistentFlags().Lookup("api_key"))
-	AdminConfig.BindEnv("api_key")
 }
 
 var AdminServiceCmd = &cobra.Command{

cmd/apg/apg.go → cmd/registry/cmd/rpc/apg.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"bytes"

cmd/apg/completion.go → cmd/registry/cmd/rpc/completion.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"os"

cmd/apg/create-api-deployment.go → cmd/registry/cmd/rpc/create-api-deployment.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/create-api-spec.go → cmd/registry/cmd/rpc/create-api-spec.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/create-api-version.go → cmd/registry/cmd/rpc/create-api-version.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/create-api.go → cmd/registry/cmd/rpc/create-api.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/create-artifact.go → cmd/registry/cmd/rpc/create-artifact.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/create-project.go → cmd/registry/cmd/rpc/create-project.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-api-deployment-revision.go → cmd/registry/cmd/rpc/delete-api-deployment-revision.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-api-deployment.go → cmd/registry/cmd/rpc/delete-api-deployment.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-api-spec-revision.go → cmd/registry/cmd/rpc/delete-api-spec-revision.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-api-spec.go → cmd/registry/cmd/rpc/delete-api-spec.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-api-version.go → cmd/registry/cmd/rpc/delete-api-version.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-api.go → cmd/registry/cmd/rpc/delete-api.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-artifact.go → cmd/registry/cmd/rpc/delete-artifact.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/delete-project.go → cmd/registry/cmd/rpc/delete-project.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-api-deployment.go → cmd/registry/cmd/rpc/get-api-deployment.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-api-spec-contents.go → cmd/registry/cmd/rpc/get-api-spec-contents.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-api-spec.go → cmd/registry/cmd/rpc/get-api-spec.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-api-version.go → cmd/registry/cmd/rpc/get-api-version.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-api.go → cmd/registry/cmd/rpc/get-api.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-artifact-contents.go → cmd/registry/cmd/rpc/get-artifact-contents.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-artifact.go → cmd/registry/cmd/rpc/get-artifact.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-project.go → cmd/registry/cmd/rpc/get-project.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-status.go → cmd/registry/cmd/rpc/get-status.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/get-storage.go → cmd/registry/cmd/rpc/get-storage.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-api-deployment-revisions.go → cmd/registry/cmd/rpc/list-api-deployment-revisions.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-api-deployments.go → cmd/registry/cmd/rpc/list-api-deployments.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-api-spec-revisions.go → cmd/registry/cmd/rpc/list-api-spec-revisions.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-api-specs.go → cmd/registry/cmd/rpc/list-api-specs.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-api-versions.go → cmd/registry/cmd/rpc/list-api-versions.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-apis.go → cmd/registry/cmd/rpc/list-apis.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-artifacts.go → cmd/registry/cmd/rpc/list-artifacts.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/list-projects.go → cmd/registry/cmd/rpc/list-projects.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"

cmd/apg/migrate-database.go → cmd/registry/cmd/rpc/migrate-database.go

@@ -1,6 +1,6 @@
 // Code generated. DO NOT EDIT.
 
-package main
+package rpc
 
 import (
 	"github.com/spf13/cobra"