chore: still ugly, not ready

Author: bketelsen

cmd/cmd.go

@@ -149,6 +149,11 @@ var (
 			Usage:   "Plugin profile to use. (local, nats, etc)",
 			EnvVars: []string{"MICRO_PROFILE"},
 		},
+		&cli.StringFlag{
+			Name:    "debug-profile",
+			Usage:   "Debug Plugin profile to use.",
+			EnvVars: []string{"MICRO_DEBUG_PROFILE"},
+		},
 		&cli.StringFlag{
 			Name:    "registry",
 			EnvVars: []string{"MICRO_REGISTRY"},
@@ -243,9 +248,9 @@ var (
 	}
 
 	DefaultBrokers = map[string]func(...broker.Option) broker.Broker{
-		"memory": broker.NewMemoryBroker,
-		"http":   broker.NewHttpBroker,
-		"nats":   nbroker.NewNatsBroker,
+		"memory":   broker.NewMemoryBroker,
+		"http":     broker.NewHttpBroker,
+		"nats":     nbroker.NewNatsBroker,
 		"rabbitmq": rabbit.NewBroker,
 	}
 
@@ -268,8 +273,8 @@ var (
 	}
 
 	DefaultStores = map[string]func(...store.Option) store.Store{
-		"memory": store.NewMemoryStore,
-		"mysql":  mysql.NewMysqlStore,
+		"memory":   store.NewMemoryStore,
+		"mysql":    mysql.NewMysqlStore,
 		"natsjskv": natsjskv.NewStore,
 		"postgres": postgres.NewStore,
 	}
@@ -296,31 +301,31 @@ func init() {
 
 func newCmd(opts ...Option) Cmd {
 	options := Options{
-		Auth:      &auth.DefaultAuth,
-		Broker:    &broker.DefaultBroker,
-		Client:    &client.DefaultClient,
-		Registry:  &registry.DefaultRegistry,
-		Server:    &server.DefaultServer,
-		Selector:  &selector.DefaultSelector,
-		Transport: &transport.DefaultTransport,
-		Store:     &store.DefaultStore,
-		Tracer:    &trace.DefaultTracer,
-		Profile:   &profile.DefaultProfile,
-		Config:    &config.DefaultConfig,
-		Cache:     &cache.DefaultCache,
-
-		Brokers:    DefaultBrokers,
-		Clients:    DefaultClients,
-		Registries: DefaultRegistries,
-		Selectors:  DefaultSelectors,
-		Servers:    DefaultServers,
-		Transports: DefaultTransports,
-		Stores:     DefaultStores,
-		Tracers:    DefaultTracers,
-		Auths:      DefaultAuths,
-		Profiles:   DefaultProfiles,
-		Configs:    DefaultConfigs,
-		Caches:     DefaultCaches,
+		Auth:         &auth.DefaultAuth,
+		Broker:       &broker.DefaultBroker,
+		Client:       &client.DefaultClient,
+		Registry:     &registry.DefaultRegistry,
+		Server:       &server.DefaultServer,
+		Selector:     &selector.DefaultSelector,
+		Transport:    &transport.DefaultTransport,
+		Store:        &store.DefaultStore,
+		Tracer:       &trace.DefaultTracer,
+		DebugProfile: &profile.DefaultProfile,
+		Config:       &config.DefaultConfig,
+		Cache:        &cache.DefaultCache,
+
+		Brokers:       DefaultBrokers,
+		Clients:       DefaultClients,
+		Registries:    DefaultRegistries,
+		Selectors:     DefaultSelectors,
+		Servers:       DefaultServers,
+		Transports:    DefaultTransports,
+		Stores:        DefaultStores,
+		Tracers:       DefaultTracers,
+		Auths:         DefaultAuths,
+		DebugProfiles: DefaultProfiles,
+		Configs:       DefaultConfigs,
+		Caches:        DefaultCaches,
 	}
 
 	for _, o := range opts {
@@ -359,10 +364,54 @@ func (c *cmd) Options() Options {
 }
 
 func (c *cmd) Before(ctx *cli.Context) error {
+	fmt.Println("cmd.Before")
 	// If flags are set then use them otherwise do nothing
 	var serverOpts []server.Option
 	var clientOpts []client.Option
+	// --- Profile Grouping Extension ---
+	// Check for new profile flag/env (not just debug profiler)
+	profileName := ctx.String("profile")
+	if profileName == "" {
+		profileName = os.Getenv("MICRO_PROFILE")
+	}
+	if profileName != "" {
+		switch profileName {
+		case "local":
+			imported := mprofile.LocalProfile()
+			*c.opts.Registry = imported.Registry
+			registry.DefaultRegistry = imported.Registry
+			*c.opts.Broker = imported.Broker
+			broker.DefaultBroker = imported.Broker
+			*c.opts.Store = imported.Store
+			store.DefaultStore = imported.Store
+			*c.opts.Transport = imported.Transport
+			transport.DefaultTransport = imported.Transport
+		case "nats":
+			imported := mprofile.NatsProfile()
+			*c.opts.Registry = imported.Registry
+			// these need to move out to a function so they can be merged with below ctx.String("Registry")
+			serverOpts = append(serverOpts, server.Registry(*c.opts.Registry))
+			clientOpts = append(clientOpts, client.Registry(*c.opts.Registry))
+			registry.DefaultRegistry = imported.Registry
+
+			*c.opts.Broker = imported.Broker
+			broker.DefaultBroker = imported.Broker
+			serverOpts = append(serverOpts, server.Broker(*c.opts.Broker))
+			clientOpts = append(clientOpts, client.Broker(*c.opts.Broker))
+
+			*c.opts.Store = imported.Store
+			store.DefaultStore = imported.Store
+			*c.opts.Transport = imported.Transport
+
+			transport.DefaultTransport = imported.Transport
+			serverOpts = append(serverOpts, server.Transport(*c.opts.Transport))
+			clientOpts = append(clientOpts, client.Transport(*c.opts.Transport))
 
+		// Add more profiles as needed
+		default:
+			return fmt.Errorf("unsupported profile: %s", profileName)
+		}
+	}
 	// Set the client
 	if name := ctx.String("client"); len(name) > 0 {
 		// only change if we have the client and type differs
@@ -453,49 +502,14 @@ func (c *cmd) Before(ctx *cli.Context) error {
 		registry.DefaultRegistry = *c.opts.Registry
 	}
 
-	// --- Profile Grouping Extension ---
-	// Check for new profile flag/env (not just debug profiler)
-	profileName := ctx.String("profile")
-	if profileName == "" {
-		profileName = os.Getenv("MICRO_PROFILE")
-	}
-	if profileName != "" {
-		switch profileName {
-		case "local":
-			imported := mprofile.LocalProfile()
-			*c.opts.Registry = imported.Registry
-			registry.DefaultRegistry = imported.Registry
-			*c.opts.Broker = imported.Broker
-			broker.DefaultBroker = imported.Broker
-			*c.opts.Store = imported.Store
-			store.DefaultStore = imported.Store
-			*c.opts.Transport = imported.Transport
-			transport.DefaultTransport = imported.Transport
-		case "nats":
-			imported := mprofile.NatsProfile()
-			*c.opts.Registry = imported.Registry
-			registry.DefaultRegistry = imported.Registry
-			*c.opts.Broker = imported.Broker
-			broker.DefaultBroker = imported.Broker
-			*c.opts.Store = imported.Store
-			store.DefaultStore = imported.Store
-			*c.opts.Transport = imported.Transport
-			transport.DefaultTransport = imported.Transport
-		// Add more profiles as needed
-		default:
-			return fmt.Errorf("unsupported profile: %s", profileName)
-		}
-	}
-
-	// Set the profile
-	if name := ctx.String("profile"); len(name) > 0 {
-		p, ok := c.opts.Profiles[name]
+	// Set the debug profile
+	if name := ctx.String("debug-profile"); len(name) > 0 {
+		p, ok := c.opts.DebugProfiles[name]
 		if !ok {
 			return fmt.Errorf("unsupported profile: %s", name)
 		}
-
-		*c.opts.Profile = p()
-		profile.DefaultProfile = *c.opts.Profile
+		*c.opts.DebugProfile = p()
+		profile.DefaultProfile = *c.opts.DebugProfile
 	}
 
 	// Set the broker
@@ -678,7 +692,6 @@ func (c *cmd) Before(ctx *cli.Context) error {
 			config.DefaultConfig = *c.opts.Config
 		}
 	}
-
 	return nil
 }
 

cmd/options.go

@@ -21,22 +21,22 @@ type Options struct {
 
 	// Other options for implementations of the interface
 	// can be stored in a context
-	Context  context.Context
-	Auth     *auth.Auth
-	Selector *selector.Selector
-	Profile  *profile.Profile
+	Context      context.Context
+	Auth         *auth.Auth
+	Selector     *selector.Selector
+	DebugProfile *profile.Profile
 
 	Registry *registry.Registry
 
-	Brokers   map[string]func(...broker.Option) broker.Broker
-	Transport *transport.Transport
-	Cache     *cache.Cache
-	Config    *config.Config
-	Client    *client.Client
-	Server    *server.Server
-	Caches    map[string]func(...cache.Option) cache.Cache
-	Tracer    *trace.Tracer
-	Profiles  map[string]func(...profile.Option) profile.Profile
+	Brokers       map[string]func(...broker.Option) broker.Broker
+	Transport     *transport.Transport
+	Cache         *cache.Cache
+	Config        *config.Config
+	Client        *client.Client
+	Server        *server.Server
+	Caches        map[string]func(...cache.Option) cache.Cache
+	Tracer        *trace.Tracer
+	DebugProfiles map[string]func(...profile.Option) profile.Profile
 
 	// We need pointers to things so we can swap them out if needed.
 	Broker     *broker.Broker
@@ -157,7 +157,7 @@ func Auth(a *auth.Auth) Option {
 
 func Profile(p *profile.Profile) Option {
 	return func(o *Options) {
-		o.Profile = p
+		o.DebugProfile = p
 		profile.DefaultProfile = *p
 	}
 }
@@ -235,6 +235,6 @@ func NewConfig(name string, t func(...config.Option) (config.Config, error)) Opt
 // New profile func.
 func NewProfile(name string, t func(...profile.Option) profile.Profile) Option {
 	return func(o *Options) {
-		o.Profiles[name] = t
+		o.DebugProfiles[name] = t
 	}
 }

profile/profile.go

@@ -34,13 +34,24 @@ func LocalProfile() Profile {
 
 func NatsProfile() Profile {
 	addr := os.Getenv("MICRO_NATS_ADDRESS")
+	reg := nreg.NewNatsRegistry(registry.Addrs(addr))
+	brok := nats.NewNatsBroker(broker.Addrs(addr))
+	// this might be wrong, look for a better way to set this up
+	st := nstore.NewStore(nstore.NatsOptions(natslib.Options{Url: addr}))
+	// same, double check for single url vs slice of Server
+	tx := ntx.NewTransport(ntx.Options(natslib.Options{Url: addr}))
+
+	registry.DefaultRegistry = reg
+	broker.DefaultBroker = brok
+	store.DefaultStore = st
+	transport.DefaultTransport = tx
 	return Profile{
-		Registry:  nreg.NewNatsRegistry(registry.Addrs(addr)),
-		Broker:    nats.NewNatsBroker(broker.Addrs(addr)),
+		Registry: reg,
+		Broker:   brok,
 		// this might be wrong, look for a better way to set this up
-		Store:     nstore.NewStore(nstore.NatsOptions(natslib.Options{Url: addr})),
+		Store: st,
 		// same, double check for single url vs slice of Server
-		Transport: ntx.NewTransport(ntx.Options(natslib.Options{Url: addr})),
+		Transport: tx,
 	}
 }
 

service/options.go

@@ -184,7 +184,7 @@ func Tracer(t trace.Tracer) Option {
 func Auth(a auth.Auth) Option {
 	return func(o *Options) {
 		o.Auth = a
-			auth.DefaultAuth = a
+		auth.DefaultAuth = a
 
 	}
 }