Update registry-experimental command constructors to match the registry tool's

cmd/registry-experimental/cmd/compute/compute.go

@@ -15,20 +15,18 @@
 package compute
 
 import (
-	"context"
-
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/compute/summary"
 	"github.com/spf13/cobra"
 )
 
-func Command(ctx context.Context) *cobra.Command {
+func Command() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "compute",
 		Short: "Compute properties of resources in the API Registry",
 	}
 
-	cmd.AddCommand(descriptorCommand(ctx))
-	cmd.AddCommand(searchIndexCommand(ctx))
+	cmd.AddCommand(descriptorCommand())
+	cmd.AddCommand(searchIndexCommand())
 	cmd.AddCommand(summary.Command())
 
 	cmd.PersistentFlags().String("filter", "", "Filter selected resources")

cmd/registry-experimental/cmd/compute/descriptor.go

@@ -40,12 +40,14 @@ import (
 	"google.golang.org/protobuf/types/descriptorpb"
 )
 
-func descriptorCommand(ctx context.Context) *cobra.Command {
+func descriptorCommand() *cobra.Command {
 	return &cobra.Command{
 		Use:   "descriptor",
 		Short: "Compute descriptors of API specs",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
+			ctx := cmd.Context()
+
 			filter, err := cmd.Flags().GetString("filter")
 			if err != nil {
 				log.FromContext(ctx).WithError(err).Fatal("Failed to get filter from flags")

cmd/registry-experimental/cmd/compute/search-index.go

@@ -36,18 +36,18 @@ import (
 
 var bleveMutex sync.Mutex
 
-func searchIndexCommand(ctx context.Context) *cobra.Command {
+func searchIndexCommand() *cobra.Command {
 	return &cobra.Command{
 		Use:   "search-index",
 		Short: "Compute a local search index of specs (experimental)",
 		Args:  cobra.MinimumNArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
+			ctx := cmd.Context()
 			filter, err := cmd.Flags().GetString("filter")
 			if err != nil {
 				log.FromContext(ctx).WithError(err).Fatal("Failed to get filter from flags")
 			}
 
-			ctx := context.Background()
 			client, err := connection.NewRegistryClient(ctx)
 			if err != nil {
 				log.FromContext(ctx).WithError(err).Fatal("Failed to get client")

cmd/registry-experimental/cmd/generate/generate.go

@@ -15,18 +15,16 @@
 package generate
 
 import (
-	"context"
-
 	"github.com/spf13/cobra"
 )
 
-func Command(ctx context.Context) *cobra.Command {
+func Command() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "generate",
 		Short: "Generate resources from the API Registry",
 	}
 
-	cmd.AddCommand(openapiCommand(ctx))
+	cmd.AddCommand(openapiCommand())
 
 	cmd.PersistentFlags().String("filter", "", "Filter selected resources")
 	return cmd

cmd/registry-experimental/cmd/generate/openapi.go

@@ -34,13 +34,14 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func openapiCommand(ctx context.Context) *cobra.Command {
+func openapiCommand() *cobra.Command {
 	var specID string
 	cmd := &cobra.Command{
 		Use:   "openapi",
 		Short: "Generate an OpenAPI spec from another specification format",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
 
 			filter, err := cmd.Flags().GetString("filter")
 			if err != nil {

cmd/registry-experimental/cmd/root.go

@@ -15,43 +15,35 @@
 package cmd
 
 import (
-	"context"
-
-	"fmt"
-
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/compute"
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/count"
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/export"
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/extract"
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/generate"
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/search"
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd/wipeout"
-	"github.com/apigee/registry/pkg/log"
-	"github.com/google/uuid"
+	pkgconf "github.com/apigee/registry/pkg/config"
 	"github.com/spf13/cobra"
 )
 
-func Command(ctx context.Context) *cobra.Command {
-	var logID string
+// Version value will be replaced by the release tag when the binaries are
+// generated by GoReleaser.
+var Version = "dev"
+
+func Command() *cobra.Command {
 	var cmd = &cobra.Command{
-		Use:   "registry-experimental",
-		Short: "Experimental utilities for working with the API Registry",
+		Use:     "registry-experimental",
+		Version: Version,
+		Short:   "Experimental utilities for working with the API Registry",
 	}
+	cmd.PersistentFlags().AddFlagSet(pkgconf.Flags)
 
-	// Bind a logger instance to the local context with metadata for outbound requests.
-	logger := log.NewLogger(log.DebugLevel)
-	ctx = log.NewOutboundContext(log.NewContext(ctx, logger), log.Metadata{
-		UID: fmt.Sprintf("%.8s", uuid.New()),
-	})
-
-	cmd.AddCommand(compute.Command(ctx))
+	cmd.AddCommand(compute.Command())
 	cmd.AddCommand(count.Command())
 	cmd.AddCommand(export.Command())
 	cmd.AddCommand(extract.Command())
-	cmd.AddCommand(generate.Command(ctx))
-	cmd.AddCommand(search.Command(ctx))
-	cmd.AddCommand(wipeout.Command(ctx))
-
-	cmd.PersistentFlags().StringVar(&logID, "log-id", "", "Assign an ID which gets attached to the log produced")
+	cmd.AddCommand(generate.Command())
+	cmd.AddCommand(search.Command())
+	cmd.AddCommand(wipeout.Command())
 	return cmd
 }

cmd/registry-experimental/cmd/search/search.go

@@ -15,7 +15,6 @@
 package search
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/apigee/registry/pkg/log"
@@ -24,12 +23,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func Command(ctx context.Context) *cobra.Command {
+func Command() *cobra.Command {
 	return &cobra.Command{
 		Use:   "search",
 		Short: "Search a local index of specs in the API Registry (experimental)",
 		Args:  cobra.MinimumNArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
+			ctx := cmd.Context()
 			// open an existing index
 			index, err := bleve.Open("registry.bleve")
 			if err != nil {

cmd/registry-experimental/cmd/wipeout/wipeout.go

@@ -24,13 +24,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func Command(ctx context.Context) *cobra.Command {
+func Command() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "wipeout PROJECT-ID",
 		Short: "Delete everything in a project",
 		Args:  cobra.MinimumNArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			ctx := context.Background()
+			ctx := cmd.Context()
 			registryClient, err := connection.NewRegistryClient(ctx)
 			if err != nil {
 				log.Fatalf(ctx, "Failed to create client: %+v", err)

cmd/registry-experimental/main.go

@@ -20,13 +20,19 @@ import (
 	"os"
 
 	"github.com/apigee/registry-experimental/cmd/registry-experimental/cmd"
+	"github.com/apigee/registry/pkg/log"
+	"github.com/google/uuid"
 )
 
 func main() {
-	ctx := context.Background()
-	cmd := cmd.Command(ctx)
-	if err := cmd.Execute(); err != nil {
-		fmt.Println(err)
+	// Bind a logger instance to the local context with metadata for outbound requests.
+	logger := log.NewLogger(log.DebugLevel)
+	ctx := log.NewOutboundContext(log.NewContext(context.Background(), logger), log.Metadata{
+		UID: fmt.Sprintf("%.8s", uuid.New()),
+	})
+
+	cmd := cmd.Command()
+	if err := cmd.ExecuteContext(ctx); err != nil {
 		os.Exit(1)
 	}
 }