Removed prefix configuration

Author: djthorpe

pkg/auth/config/config.go

@@ -15,9 +15,8 @@ import (
 // TYPES
 
 type Config struct {
-	Pool   server.PG         `kong:"-"`                                    // Connection pool
-	Router server.HTTPRouter `kong:"-"`                                    // Which HTTP router to use
-	Prefix string            `default:"${AUTH_PREFIX}" help:"Path prefix"` // HTTP Path Prefix
+	Pool   server.PG         `kong:"-"` // Connection pool
+	Router server.HTTPRouter `kong:"-"` // Which HTTP router to use
 }
 
 var _ server.Plugin = Config{}
@@ -39,9 +38,9 @@ func (c Config) New(ctx context.Context) (server.Task, error) {
 
 	// Register HTTP handlers
 	if c.Router != nil {
-		handler.RegisterUser(ctx, c.Router, c.Prefix, manager)
-		handler.RegisterToken(ctx, c.Router, c.Prefix, manager)
-		handler.RegisterAuth(ctx, c.Router, c.Prefix, manager)
+		handler.RegisterUser(ctx, c.Router, schema.APIPrefix, manager)
+		handler.RegisterToken(ctx, c.Router, schema.APIPrefix, manager)
+		handler.RegisterAuth(ctx, c.Router, schema.APIPrefix, manager)
 	}
 
 	// Create a new task with the connection pool

pkg/cert/config/config.go

@@ -19,9 +19,8 @@ import (
 // TYPES
 
 type Config struct {
-	Pool   server.PG         `kong:"-"`                                    // Connection pool
-	Router server.HTTPRouter `kong:"-"`                                    // Which HTTP router to use
-	Prefix string            `default:"${CERT_PREFIX}" help:"Path prefix"` // HTTP Path Prefix
+	Pool   server.PG         `kong:"-"` // Connection pool
+	Router server.HTTPRouter `kong:"-"` // Which HTTP router to use
 	Root   struct {
 		Organization  string `name:"org" help:"Organization name"`
 		Unit          string `name:"unit" help:"Organization unit"`
@@ -67,8 +66,8 @@ func (c Config) New(ctx context.Context) (server.Task, error) {
 
 	// Register HTTP handlers
 	if c.Router != nil {
-		certhandler.RegisterName(ctx, c.Router, c.Prefix, certmanager)
-		certhandler.RegisterCert(ctx, c.Router, c.Prefix, certmanager)
+		certhandler.RegisterName(ctx, c.Router, schema.APIPrefix, certmanager)
+		certhandler.RegisterCert(ctx, c.Router, schema.APIPrefix, certmanager)
 	}
 
 	// Queue ticker and queue to check for SSL expiry

pkg/pgmanager/config/config.go

@@ -8,6 +8,7 @@ import (
 	server "github.com/mutablelogic/go-server"
 	pgmanager "github.com/mutablelogic/go-server/pkg/pgmanager"
 	pghandler "github.com/mutablelogic/go-server/pkg/pgmanager/handler"
+	schema "github.com/mutablelogic/go-server/pkg/pgmanager/schema"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -20,8 +21,7 @@ type Config struct {
 	Database string            `env:"PG_DATABASE" help:"Database name, uses username if not set"`
 	SSLMode  string            `env:"PG_SSLMODE" enum:"default,disable,allow,prefer,require,verify-ca,verify-full" help:"SSL mode"`
 	Trace    pg.TraceFn        `json:"-" kong:"-"`
-	Router   server.HTTPRouter `json:"-" kong:"-"`  // Which HTTP router to use
-	Prefix   string            `help:"Path prefix"` // HTTP Path Prefix
+	Router   server.HTTPRouter `json:"-" kong:"-"` // Which HTTP router to use
 }
 
 var _ server.Plugin = Config{}
@@ -60,12 +60,12 @@ func (c Config) New(ctx context.Context) (server.Task, error) {
 		if manager, err := pgmanager.New(ctx, pool); err != nil {
 			return nil, err
 		} else {
-			pghandler.RegisterRole(ctx, c.Router, c.Prefix, manager)
-			pghandler.RegisterDatabase(ctx, c.Router, c.Prefix, manager)
-			pghandler.RegisterSchema(ctx, c.Router, c.Prefix, manager)
-			pghandler.RegisterObject(ctx, c.Router, c.Prefix, manager)
-			pghandler.RegisterConnection(ctx, c.Router, c.Prefix, manager)
-			pghandler.RegisterTablespace(ctx, c.Router, c.Prefix, manager)
+			pghandler.RegisterRole(ctx, c.Router, schema.APIPrefix, manager)
+			pghandler.RegisterDatabase(ctx, c.Router, schema.APIPrefix, manager)
+			pghandler.RegisterSchema(ctx, c.Router, schema.APIPrefix, manager)
+			pghandler.RegisterObject(ctx, c.Router, schema.APIPrefix, manager)
+			pghandler.RegisterConnection(ctx, c.Router, schema.APIPrefix, manager)
+			pghandler.RegisterTablespace(ctx, c.Router, schema.APIPrefix, manager)
 		}
 	}
 

pkg/pgqueue/config/config.go

@@ -16,11 +16,10 @@ import (
 // TYPES
 
 type Config struct {
-	Pool      server.PG         `kong:"-"`                                     // Connection pool
-	Router    server.HTTPRouter `kong:"-"`                                     // Which HTTP router to use
-	Namespace *string           `help:"Namespace"`                             // Namespace for queues and tickers
-	Worker    *string           `help:"Worker name"`                           // The name of the worker
-	Prefix    string            `default:"${QUEUE_PREFIX}" help:"Path prefix"` // HTTP Path Prefix
+	Pool      server.PG         `kong:"-"`           // Connection pool
+	Router    server.HTTPRouter `kong:"-"`           // Which HTTP router to use
+	Namespace *string           `help:"Namespace"`   // Namespace for queues and tickers
+	Worker    *string           `help:"Worker name"` // The name of the worker
 }
 
 var _ server.Plugin = Config{}
@@ -50,7 +49,7 @@ func (c Config) New(ctx context.Context) (server.Task, error) {
 
 	// Register HTTP handlers
 	if c.Router != nil {
-		handler.Register(ctx, c.Router, c.Prefix, manager)
+		handler.Register(ctx, c.Router, schema.APIPrefix, manager)
 	}
 
 	// Return the task