Skip to content

Commit 567e39d

Browse files
committed
Updated comments
1 parent 135697a commit 567e39d

File tree

6 files changed

+20
-5
lines changed

6 files changed

+20
-5
lines changed

cmd/server/main.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ import (
99
kong "github.com/alecthomas/kong"
1010
server "github.com/mutablelogic/go-server"
1111
auth "github.com/mutablelogic/go-server/pkg/auth/cmd"
12+
auth_schema "github.com/mutablelogic/go-server/pkg/auth/schema"
1213
certmanager "github.com/mutablelogic/go-server/pkg/cert/cmd"
14+
cert_schema "github.com/mutablelogic/go-server/pkg/cert/schema"
1315
pgmanager "github.com/mutablelogic/go-server/pkg/pgmanager/cmd"
16+
pgmanager_schema "github.com/mutablelogic/go-server/pkg/pgmanager/schema"
1417
pgqueue "github.com/mutablelogic/go-server/pkg/pgqueue/cmd"
18+
pgqueue_schema "github.com/mutablelogic/go-server/pkg/pgqueue/schema"
1519
)
1620

1721
///////////////////////////////////////////////////////////////////////////////
@@ -51,10 +55,10 @@ func main() {
5155
kong.Vars{
5256
"HOST": hostName(),
5357
"USER": userName(),
54-
"CERT_PREFIX": "/cert/v1",
55-
"PG_PREFIX": "/pg/v1",
56-
"AUTH_PREFIX": "/auth/v1",
57-
"QUEUE_PREFIX": "/queue/v1",
58+
"CERT_PREFIX": cert_schema.APIPrefix,
59+
"PG_PREFIX": pgmanager_schema.APIPrefix,
60+
"AUTH_PREFIX": auth_schema.APIPrefix,
61+
"QUEUE_PREFIX": pgqueue_schema.APIPrefix,
5862
},
5963
)
6064

cmd/server/service.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ import (
99
// Packages
1010
server "github.com/mutablelogic/go-server"
1111
helloworld "github.com/mutablelogic/go-server/npm/helloworld"
12+
auth_schema "github.com/mutablelogic/go-server/pkg/auth/schema"
13+
cert_schema "github.com/mutablelogic/go-server/pkg/cert/schema"
1214
httpresponse "github.com/mutablelogic/go-server/pkg/httpresponse"
15+
pgmanager_schema "github.com/mutablelogic/go-server/pkg/pgmanager/schema"
16+
pgqueue_schema "github.com/mutablelogic/go-server/pkg/pgqueue/schema"
1317
provider "github.com/mutablelogic/go-server/pkg/provider"
1418
ref "github.com/mutablelogic/go-server/pkg/ref"
1519
types "github.com/mutablelogic/go-server/pkg/types"
@@ -104,6 +108,7 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
104108
pgpool := config.(*pg.Config)
105109

106110
// Set router
111+
pgpool.Prefix = pgmanager_schema.APIPrefix
107112
if router, ok := provider.Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
108113
return httpresponse.ErrInternalError.With("Invalid router")
109114
} else {
@@ -128,6 +133,7 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
128133
auth := config.(*auth.Config)
129134

130135
// Set the router
136+
auth.Prefix = auth_schema.APIPrefix
131137
if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
132138
return httpresponse.ErrInternalError.With("Invalid router")
133139
} else {
@@ -148,6 +154,7 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
148154
pgqueue := config.(*pgqueue.Config)
149155

150156
// Set the router
157+
pgqueue.Prefix = pgqueue_schema.APIPrefix
151158
if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
152159
return httpresponse.ErrInternalError.With("Invalid router")
153160
} else {
@@ -167,6 +174,7 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
167174
certmanager := config.(*cert.Config)
168175

169176
// Set the router
177+
certmanager.Prefix = cert_schema.APIPrefix
170178
if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
171179
return httpresponse.ErrInternalError.With("Invalid router")
172180
} else {

pkg/auth/schema/schema.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const (
1515
RootUserName = "root"
1616
UserListLimit = 50
1717
AuthHashAlgorithm = "sha256"
18+
APIPrefix = "/auth/v1"
1819
)
1920

2021
const (

pkg/cert/schema/schema.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
const (
1414
SchemaName = "certmanager"
15+
APIPrefix = "/cert/v1"
1516
)
1617

1718
const (

pkg/pgmanager/schema/globals.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
const (
1313
CatalogSchema = "pg_catalog"
14+
APIPrefix = "/pg/v1"
1415
)
1516

1617
const (

pkg/pgqueue/schema/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const (
1515
SchemaName = "pgqueue"
1616
DefaultNamespace = "default"
1717
CleanupNamespace = "cleanup"
18-
DefaultPrefix = "/queue/v1"
18+
APIPrefix = "/queue/v1"
1919
TopicQueueInsert = "queue_insert"
2020
QueueListLimit = 100
2121
TickerListLimit = 100

0 commit comments

Comments
 (0)