Compare commits
24 Commits
5413737491
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 65109a787c | |||
| 75f1406edf | |||
| 11dc9b507f | |||
| da616438e9 | |||
| 7486865343 | |||
| fd0fd8954a | |||
| 628db14f59 | |||
| 7be196e4c3 | |||
| 2f4bd45efb | |||
| 1b53c2b66b | |||
| 509e68f538 | |||
| e6a44d830e | |||
| fe396b7537 | |||
| 6eb04aa3c5 | |||
| 517d4482c9 | |||
| b6e2bf942a | |||
| 9f1058ba81 | |||
| 2bdbb29ae6 | |||
| 9d243a0ed1 | |||
| 9c74828b8d | |||
| 9e78477eb5 | |||
| a74980caa1 | |||
| 816f08a20a | |||
| 0cec152486 |
@@ -419,14 +419,10 @@ This will regenerate the swagger documentation and update the `docs/swagger.json
|
|||||||
|
|
||||||
## Roadmap
|
## Roadmap
|
||||||
|
|
||||||
- [ ] migrate cli to urfave/cli
|
- [x] migrate cli to urfave/cli
|
||||||
- [ ] add a ML powered nsfw link detection
|
- [ ] add a ML powered nsfw link detection
|
||||||
- [ ] add right management within the app
|
|
||||||
- [ ] add an admin backoffice to manage rights, users, content and settings
|
|
||||||
- [ ] add a way to run read-only communities
|
- [ ] add a way to run read-only communities
|
||||||
- [ ] migrate raw CSS to UnoCSS
|
- [ ] migrate raw CSS to UnoCSS
|
||||||
- [ ] kubernetes deployment
|
|
||||||
- [ ] store configuration in the database
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
132
cmd/goyco/cli.go
132
cmd/goyco/cli.go
@@ -1,14 +1,24 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"goyco/cmd/goyco/commands"
|
"goyco/cmd/goyco/commands"
|
||||||
|
"goyco/internal/config"
|
||||||
|
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
|
"github.com/urfave/cli/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
helpPrinterOnce sync.Once
|
||||||
|
defaultHelpPrinter func(io.Writer, string, interface{})
|
||||||
)
|
)
|
||||||
|
|
||||||
func loadDotEnv() {
|
func loadDotEnv() {
|
||||||
@@ -55,3 +65,125 @@ func printRunUsage() {
|
|||||||
fmt.Fprintln(os.Stderr, "Usage: goyco run")
|
fmt.Fprintln(os.Stderr, "Usage: goyco run")
|
||||||
fmt.Fprintln(os.Stderr, "\nStart the web application in foreground.")
|
fmt.Fprintln(os.Stderr, "\nStart the web application in foreground.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func buildRootCommand(cfg *config.Config) *cli.Command {
|
||||||
|
helpPrinterOnce.Do(func() {
|
||||||
|
defaultHelpPrinter = cli.HelpPrinter
|
||||||
|
})
|
||||||
|
cli.HelpPrinter = func(w io.Writer, templ string, data interface{}) {
|
||||||
|
if cmd, ok := data.(*cli.Command); ok && cmd.Root() == cmd {
|
||||||
|
printRootUsage()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defaultHelpPrinter(w, templ, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
root := &cli.Command{
|
||||||
|
Name: "goyco",
|
||||||
|
Usage: "Y Combinator-style news aggregation platform API",
|
||||||
|
UsageText: "goyco <command> [<args>]",
|
||||||
|
HideVersion: true,
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Name: "json",
|
||||||
|
Usage: "output results in JSON format",
|
||||||
|
Value: cfg.CLI.JSONOutputDefault,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
|
||||||
|
commands.SetJSONOutput(cmd.Bool("json"))
|
||||||
|
return ctx, nil
|
||||||
|
},
|
||||||
|
After: func(ctx context.Context, cmd *cli.Command) error {
|
||||||
|
cli.HelpPrinter = defaultHelpPrinter
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
if cmd.NArg() == 0 {
|
||||||
|
printRootUsage()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
printRootUsage()
|
||||||
|
return fmt.Errorf("unknown command: %s", cmd.Args().First())
|
||||||
|
},
|
||||||
|
Commands: []*cli.Command{
|
||||||
|
{
|
||||||
|
Name: "run",
|
||||||
|
Usage: "start the web application in foreground",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return handleRunCommand(cfg, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "start",
|
||||||
|
Usage: "start the web application in background",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandleStartCommand(cfg, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "stop",
|
||||||
|
Usage: "stop the daemon",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandleStopCommand(cfg, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "status",
|
||||||
|
Usage: "check if the daemon is running",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandleStatusCommand(cfg, cmd.Name, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "migrate",
|
||||||
|
Aliases: []string{"migrations"},
|
||||||
|
Usage: "apply database migrations",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandleMigrateCommand(cfg, cmd.Name, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "user",
|
||||||
|
Usage: "manage users (create, update, delete, lock, list)",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandleUserCommand(cfg, cmd.Name, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "post",
|
||||||
|
Usage: "manage posts (delete, list, search)",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandlePostCommand(cfg, cmd.Name, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "prune",
|
||||||
|
Usage: "hard delete users and posts (posts, all)",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandlePruneCommand(cfg, cmd.Name, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "seed",
|
||||||
|
Usage: "seed database with random data",
|
||||||
|
SkipFlagParsing: true,
|
||||||
|
Action: func(_ context.Context, cmd *cli.Command) error {
|
||||||
|
return commands.HandleSeedCommand(cfg, cmd.Name, cmd.Args().Slice())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Writer: os.Stdout,
|
||||||
|
ErrWriter: os.Stderr,
|
||||||
|
}
|
||||||
|
|
||||||
|
return root
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"flag"
|
"flag"
|
||||||
"os"
|
"os"
|
||||||
@@ -131,25 +132,26 @@ func TestPrintRunUsage(t *testing.T) {
|
|||||||
printRunUsage()
|
printRunUsage()
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDispatchCommand(t *testing.T) {
|
func TestRootCommandDispatch(t *testing.T) {
|
||||||
|
|
||||||
t.Run("unknown command", func(t *testing.T) {
|
t.Run("unknown command", func(t *testing.T) {
|
||||||
cfg := testutils.NewTestConfig()
|
cfg := testutils.NewTestConfig()
|
||||||
err := dispatchCommand(cfg, "unknown", []string{})
|
cmd := buildRootCommand(cfg)
|
||||||
|
err := cmd.Run(context.Background(), []string{"goyco", "unknown"})
|
||||||
|
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Error("expected error for unknown command")
|
t.Error("expected error for unknown command")
|
||||||
}
|
}
|
||||||
|
|
||||||
expectedErr := "unknown command: unknown"
|
expectedErr := "unknown command: unknown"
|
||||||
if err.Error() != expectedErr {
|
if err != nil && err.Error() != expectedErr {
|
||||||
t.Errorf("expected error %q, got %q", expectedErr, err.Error())
|
t.Errorf("expected error %q, got %q", expectedErr, err.Error())
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("help command", func(t *testing.T) {
|
t.Run("help command", func(t *testing.T) {
|
||||||
cfg := testutils.NewTestConfig()
|
cfg := testutils.NewTestConfig()
|
||||||
err := dispatchCommand(cfg, "help", []string{})
|
cmd := buildRootCommand(cfg)
|
||||||
|
err := cmd.Run(context.Background(), []string{"goyco", "help"})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("unexpected error for help command: %v", err)
|
t.Errorf("unexpected error for help command: %v", err)
|
||||||
@@ -158,7 +160,8 @@ func TestDispatchCommand(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("h command", func(t *testing.T) {
|
t.Run("h command", func(t *testing.T) {
|
||||||
cfg := testutils.NewTestConfig()
|
cfg := testutils.NewTestConfig()
|
||||||
err := dispatchCommand(cfg, "-h", []string{})
|
cmd := buildRootCommand(cfg)
|
||||||
|
err := cmd.Run(context.Background(), []string{"goyco", "-h"})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("unexpected error for -h command: %v", err)
|
t.Errorf("unexpected error for -h command: %v", err)
|
||||||
@@ -167,7 +170,8 @@ func TestDispatchCommand(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("--help command", func(t *testing.T) {
|
t.Run("--help command", func(t *testing.T) {
|
||||||
cfg := testutils.NewTestConfig()
|
cfg := testutils.NewTestConfig()
|
||||||
err := dispatchCommand(cfg, "--help", []string{})
|
cmd := buildRootCommand(cfg)
|
||||||
|
err := cmd.Run(context.Background(), []string{"goyco", "--help"})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("unexpected error for --help command: %v", err)
|
t.Errorf("unexpected error for --help command: %v", err)
|
||||||
@@ -179,7 +183,8 @@ func TestDispatchCommand(t *testing.T) {
|
|||||||
|
|
||||||
useInMemoryCommandsConnector(t)
|
useInMemoryCommandsConnector(t)
|
||||||
|
|
||||||
err := dispatchCommand(cfg, "post", []string{"list"})
|
cmd := buildRootCommand(cfg)
|
||||||
|
err := cmd.Run(context.Background(), []string{"goyco", "post", "list"})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("unexpected error for post list: %v", err)
|
t.Errorf("unexpected error for post list: %v", err)
|
||||||
|
|||||||
@@ -1,527 +0,0 @@
|
|||||||
package commands
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"math/rand"
|
|
||||||
"runtime"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"goyco/internal/database"
|
|
||||||
"goyco/internal/repositories"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ParallelProcessor struct {
|
|
||||||
maxWorkers int
|
|
||||||
timeout time.Duration
|
|
||||||
passwordHash string
|
|
||||||
randSource *rand.Rand
|
|
||||||
randMu sync.Mutex
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewParallelProcessor() *ParallelProcessor {
|
|
||||||
maxWorkers := max(min(runtime.NumCPU(), 8), 2)
|
|
||||||
|
|
||||||
seed := time.Now().UnixNano()
|
|
||||||
|
|
||||||
return &ParallelProcessor{
|
|
||||||
maxWorkers: maxWorkers,
|
|
||||||
timeout: 60 * time.Second,
|
|
||||||
randSource: rand.New(rand.NewSource(seed)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) SetPasswordHash(hash string) {
|
|
||||||
p.passwordHash = hash
|
|
||||||
}
|
|
||||||
|
|
||||||
type indexedResult[T any] struct {
|
|
||||||
value T
|
|
||||||
index int
|
|
||||||
}
|
|
||||||
|
|
||||||
func processInParallel[T any](
|
|
||||||
ctx context.Context,
|
|
||||||
maxWorkers int,
|
|
||||||
count int,
|
|
||||||
processor func(index int) (T, error),
|
|
||||||
errorPrefix string,
|
|
||||||
progress *ProgressIndicator,
|
|
||||||
) ([]T, error) {
|
|
||||||
results := make(chan indexedResult[T], count)
|
|
||||||
errors := make(chan error, count)
|
|
||||||
|
|
||||||
semaphore := make(chan struct{}, maxWorkers)
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
|
|
||||||
for i := range count {
|
|
||||||
wg.Add(1)
|
|
||||||
go func(index int) {
|
|
||||||
defer wg.Done()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case semaphore <- struct{}{}:
|
|
||||||
case <-ctx.Done():
|
|
||||||
errors <- ctx.Err()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer func() { <-semaphore }()
|
|
||||||
|
|
||||||
value, err := processor(index + 1)
|
|
||||||
if err != nil {
|
|
||||||
errors <- fmt.Errorf("%s %d: %w", errorPrefix, index+1, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
results <- indexedResult[T]{value: value, index: index}
|
|
||||||
}(i)
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
wg.Wait()
|
|
||||||
close(results)
|
|
||||||
close(errors)
|
|
||||||
}()
|
|
||||||
|
|
||||||
items := make([]T, count)
|
|
||||||
completed := 0
|
|
||||||
firstError := make(chan error, 1)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
for err := range errors {
|
|
||||||
if err != nil {
|
|
||||||
select {
|
|
||||||
case firstError <- err:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
for completed < count {
|
|
||||||
select {
|
|
||||||
case result, ok := <-results:
|
|
||||||
if !ok {
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
items[result.index] = result.value
|
|
||||||
completed++
|
|
||||||
if progress != nil {
|
|
||||||
progress.Update(completed)
|
|
||||||
}
|
|
||||||
case err := <-firstError:
|
|
||||||
return nil, err
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil, fmt.Errorf("timeout: %w", ctx.Err())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) CreateUsersInParallel(userRepo repositories.UserRepository, count int, progress *ProgressIndicator) ([]database.User, error) {
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), p.timeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
return processInParallel(ctx, p.maxWorkers, count,
|
|
||||||
func(index int) (database.User, error) {
|
|
||||||
return p.createSingleUser(userRepo, index)
|
|
||||||
},
|
|
||||||
"create user",
|
|
||||||
progress,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) CreatePostsInParallel(postRepo repositories.PostRepository, authorID uint, count int, progress *ProgressIndicator) ([]database.Post, error) {
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), p.timeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
return processInParallel(ctx, p.maxWorkers, count,
|
|
||||||
func(index int) (database.Post, error) {
|
|
||||||
return p.createSinglePost(postRepo, authorID, index)
|
|
||||||
},
|
|
||||||
"create post",
|
|
||||||
progress,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func processItemsInParallel[T any, R any](
|
|
||||||
ctx context.Context,
|
|
||||||
maxWorkers int,
|
|
||||||
items []T,
|
|
||||||
processor func(index int, item T) (R, error),
|
|
||||||
errorPrefix string,
|
|
||||||
aggregator func(accumulator R, value R) R,
|
|
||||||
initialValue R,
|
|
||||||
progress *ProgressIndicator,
|
|
||||||
) (R, error) {
|
|
||||||
count := len(items)
|
|
||||||
results := make(chan indexedResult[R], count)
|
|
||||||
errors := make(chan error, count)
|
|
||||||
|
|
||||||
semaphore := make(chan struct{}, maxWorkers)
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
|
|
||||||
for i, item := range items {
|
|
||||||
wg.Add(1)
|
|
||||||
go func(index int, item T) {
|
|
||||||
defer wg.Done()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case semaphore <- struct{}{}:
|
|
||||||
case <-ctx.Done():
|
|
||||||
errors <- ctx.Err()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer func() { <-semaphore }()
|
|
||||||
|
|
||||||
value, err := processor(index, item)
|
|
||||||
if err != nil {
|
|
||||||
errors <- fmt.Errorf("%s %d: %w", errorPrefix, index+1, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
results <- indexedResult[R]{value: value, index: index}
|
|
||||||
}(i, item)
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
wg.Wait()
|
|
||||||
close(results)
|
|
||||||
close(errors)
|
|
||||||
}()
|
|
||||||
|
|
||||||
accumulator := initialValue
|
|
||||||
completed := 0
|
|
||||||
firstError := make(chan error, 1)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
for err := range errors {
|
|
||||||
if err != nil {
|
|
||||||
select {
|
|
||||||
case firstError <- err:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
for completed < count {
|
|
||||||
select {
|
|
||||||
case result, ok := <-results:
|
|
||||||
if !ok {
|
|
||||||
return accumulator, nil
|
|
||||||
}
|
|
||||||
accumulator = aggregator(accumulator, result.value)
|
|
||||||
completed++
|
|
||||||
if progress != nil {
|
|
||||||
progress.Update(completed)
|
|
||||||
}
|
|
||||||
case err := <-firstError:
|
|
||||||
return initialValue, err
|
|
||||||
case <-ctx.Done():
|
|
||||||
return initialValue, fmt.Errorf("timeout: %w", ctx.Err())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return accumulator, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) CreateVotesInParallel(voteRepo repositories.VoteRepository, users []database.User, posts []database.Post, avgVotesPerPost int, progress *ProgressIndicator) (int, error) {
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), p.timeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
return processItemsInParallel(ctx, p.maxWorkers, posts,
|
|
||||||
func(index int, post database.Post) (int, error) {
|
|
||||||
return p.createVotesForPost(voteRepo, users, post, avgVotesPerPost)
|
|
||||||
},
|
|
||||||
"create votes for post",
|
|
||||||
func(acc, val int) int { return acc + val },
|
|
||||||
0,
|
|
||||||
progress,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func processItemsInParallelNoResult[T any](
|
|
||||||
ctx context.Context,
|
|
||||||
maxWorkers int,
|
|
||||||
items []T,
|
|
||||||
processor func(index int, item T) error,
|
|
||||||
errorFormatter func(index int, item T, err error) error,
|
|
||||||
progress *ProgressIndicator,
|
|
||||||
) error {
|
|
||||||
count := len(items)
|
|
||||||
errors := make(chan error, count)
|
|
||||||
completions := make(chan struct{}, count)
|
|
||||||
|
|
||||||
semaphore := make(chan struct{}, maxWorkers)
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
|
|
||||||
for i, item := range items {
|
|
||||||
wg.Add(1)
|
|
||||||
go func(index int, item T) {
|
|
||||||
defer wg.Done()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case semaphore <- struct{}{}:
|
|
||||||
case <-ctx.Done():
|
|
||||||
errors <- ctx.Err()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer func() { <-semaphore }()
|
|
||||||
|
|
||||||
err := processor(index, item)
|
|
||||||
if err != nil {
|
|
||||||
if errorFormatter != nil {
|
|
||||||
errors <- errorFormatter(index, item, err)
|
|
||||||
} else {
|
|
||||||
errors <- fmt.Errorf("process item %d: %w", index+1, err)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
completions <- struct{}{}
|
|
||||||
}(i, item)
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
wg.Wait()
|
|
||||||
close(errors)
|
|
||||||
close(completions)
|
|
||||||
}()
|
|
||||||
|
|
||||||
completed := 0
|
|
||||||
firstError := make(chan error, 1)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
for err := range errors {
|
|
||||||
if err != nil {
|
|
||||||
select {
|
|
||||||
case firstError <- err:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
for completed < count {
|
|
||||||
select {
|
|
||||||
case _, ok := <-completions:
|
|
||||||
if !ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
completed++
|
|
||||||
if progress != nil {
|
|
||||||
progress.Update(completed)
|
|
||||||
}
|
|
||||||
case err := <-firstError:
|
|
||||||
return err
|
|
||||||
case <-ctx.Done():
|
|
||||||
return fmt.Errorf("timeout: %w", ctx.Err())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) UpdatePostScoresInParallel(postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, posts []database.Post, progress *ProgressIndicator) error {
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), p.timeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
return processItemsInParallelNoResult(ctx, p.maxWorkers, posts,
|
|
||||||
func(index int, post database.Post) error {
|
|
||||||
return p.updateSinglePostScore(postRepo, voteRepo, post)
|
|
||||||
},
|
|
||||||
func(index int, post database.Post, err error) error {
|
|
||||||
return fmt.Errorf("update post %d scores: %w", post.ID, err)
|
|
||||||
},
|
|
||||||
progress,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) generateRandomIdentifier() string {
|
|
||||||
const length = 12
|
|
||||||
const chars = "abcdefghijklmnopqrstuvwxyz0123456789"
|
|
||||||
identifier := make([]byte, length)
|
|
||||||
p.randMu.Lock()
|
|
||||||
for i := range identifier {
|
|
||||||
identifier[i] = chars[p.randSource.Intn(len(chars))]
|
|
||||||
}
|
|
||||||
p.randMu.Unlock()
|
|
||||||
return string(identifier)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) createSingleUser(userRepo repositories.UserRepository, index int) (database.User, error) {
|
|
||||||
randomID := p.generateRandomIdentifier()
|
|
||||||
username := fmt.Sprintf("user_%s", randomID)
|
|
||||||
email := fmt.Sprintf("user_%s@goyco.local", randomID)
|
|
||||||
|
|
||||||
const maxRetries = 10
|
|
||||||
for range maxRetries {
|
|
||||||
user := &database.User{
|
|
||||||
Username: username,
|
|
||||||
Email: email,
|
|
||||||
Password: p.passwordHash,
|
|
||||||
EmailVerified: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := userRepo.Create(user); err != nil {
|
|
||||||
randomID = p.generateRandomIdentifier()
|
|
||||||
username = fmt.Sprintf("user_%s", randomID)
|
|
||||||
email = fmt.Sprintf("user_%s@goyco.local", randomID)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
return *user, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return database.User{}, fmt.Errorf("failed to create user after %d attempts", maxRetries)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) createSinglePost(postRepo repositories.PostRepository, authorID uint, index int) (database.Post, error) {
|
|
||||||
sampleTitles := []string{
|
|
||||||
"Amazing JavaScript Framework",
|
|
||||||
"Python Best Practices",
|
|
||||||
"Go Performance Tips",
|
|
||||||
"Database Optimization",
|
|
||||||
"Web Security Guide",
|
|
||||||
"Machine Learning Basics",
|
|
||||||
"Cloud Architecture",
|
|
||||||
"DevOps Automation",
|
|
||||||
"API Design Patterns",
|
|
||||||
"Frontend Optimization",
|
|
||||||
"Backend Scaling",
|
|
||||||
"Container Orchestration",
|
|
||||||
"Microservices Architecture",
|
|
||||||
"Testing Strategies",
|
|
||||||
"Code Review Process",
|
|
||||||
"Version Control Best Practices",
|
|
||||||
"Continuous Integration",
|
|
||||||
"Monitoring and Alerting",
|
|
||||||
"Error Handling Patterns",
|
|
||||||
"Data Structures Explained",
|
|
||||||
}
|
|
||||||
|
|
||||||
sampleDomains := []string{
|
|
||||||
"example.com",
|
|
||||||
"techblog.org",
|
|
||||||
"devguide.net",
|
|
||||||
"programming.io",
|
|
||||||
"codeexamples.com",
|
|
||||||
"tutorialhub.org",
|
|
||||||
"bestpractices.dev",
|
|
||||||
"learnprogramming.net",
|
|
||||||
"codingtips.org",
|
|
||||||
"softwareengineering.com",
|
|
||||||
}
|
|
||||||
|
|
||||||
title := sampleTitles[index%len(sampleTitles)]
|
|
||||||
if index >= len(sampleTitles) {
|
|
||||||
title = fmt.Sprintf("%s - Part %d", title, (index/len(sampleTitles))+1)
|
|
||||||
}
|
|
||||||
|
|
||||||
domain := sampleDomains[index%len(sampleDomains)]
|
|
||||||
randomID := p.generateRandomIdentifier()
|
|
||||||
path := fmt.Sprintf("/article/%s", randomID)
|
|
||||||
url := fmt.Sprintf("https://%s%s", domain, path)
|
|
||||||
|
|
||||||
content := fmt.Sprintf("Autogenerated seed post #%d\n\nThis is sample content for testing purposes. The post discusses %s and provides valuable insights.", index, title)
|
|
||||||
|
|
||||||
const maxRetries = 10
|
|
||||||
for range maxRetries {
|
|
||||||
post := &database.Post{
|
|
||||||
Title: title,
|
|
||||||
URL: url,
|
|
||||||
Content: content,
|
|
||||||
AuthorID: &authorID,
|
|
||||||
UpVotes: 0,
|
|
||||||
DownVotes: 0,
|
|
||||||
Score: 0,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := postRepo.Create(post); err != nil {
|
|
||||||
randomID = p.generateRandomIdentifier()
|
|
||||||
path = fmt.Sprintf("/article/%s", randomID)
|
|
||||||
url = fmt.Sprintf("https://%s%s", domain, path)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
return *post, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return database.Post{}, fmt.Errorf("failed to create post after %d attempts", maxRetries)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) createVotesForPost(voteRepo repositories.VoteRepository, users []database.User, post database.Post, avgVotesPerPost int) (int, error) {
|
|
||||||
p.randMu.Lock()
|
|
||||||
numVotes := p.randSource.Intn(avgVotesPerPost*2 + 1)
|
|
||||||
p.randMu.Unlock()
|
|
||||||
|
|
||||||
if numVotes == 0 && avgVotesPerPost > 0 {
|
|
||||||
p.randMu.Lock()
|
|
||||||
if p.randSource.Intn(5) > 0 {
|
|
||||||
numVotes = 1
|
|
||||||
}
|
|
||||||
p.randMu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
totalVotes := 0
|
|
||||||
usedUsers := make(map[uint]bool)
|
|
||||||
|
|
||||||
for i := 0; i < numVotes && len(usedUsers) < len(users); i++ {
|
|
||||||
p.randMu.Lock()
|
|
||||||
userIdx := p.randSource.Intn(len(users))
|
|
||||||
p.randMu.Unlock()
|
|
||||||
user := users[userIdx]
|
|
||||||
|
|
||||||
if usedUsers[user.ID] {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
usedUsers[user.ID] = true
|
|
||||||
|
|
||||||
p.randMu.Lock()
|
|
||||||
voteTypeInt := p.randSource.Intn(10)
|
|
||||||
p.randMu.Unlock()
|
|
||||||
var voteType database.VoteType
|
|
||||||
if voteTypeInt < 7 {
|
|
||||||
voteType = database.VoteUp
|
|
||||||
} else {
|
|
||||||
voteType = database.VoteDown
|
|
||||||
}
|
|
||||||
|
|
||||||
vote := &database.Vote{
|
|
||||||
UserID: &user.ID,
|
|
||||||
PostID: post.ID,
|
|
||||||
Type: voteType,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := voteRepo.CreateOrUpdate(vote); err != nil {
|
|
||||||
return totalVotes, fmt.Errorf("create or update vote: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
totalVotes++
|
|
||||||
}
|
|
||||||
|
|
||||||
return totalVotes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *ParallelProcessor) updateSinglePostScore(postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, post database.Post) error {
|
|
||||||
upVotes, downVotes, err := getVoteCounts(voteRepo, post.ID)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("get vote counts: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
post.UpVotes = upVotes
|
|
||||||
post.DownVotes = downVotes
|
|
||||||
post.Score = upVotes - downVotes
|
|
||||||
|
|
||||||
if err := postRepo.Update(&post); err != nil {
|
|
||||||
return fmt.Errorf("update post: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,145 +0,0 @@
|
|||||||
package commands_test
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"goyco/cmd/goyco/commands"
|
|
||||||
"goyco/internal/database"
|
|
||||||
"goyco/internal/repositories"
|
|
||||||
"goyco/internal/testutils"
|
|
||||||
|
|
||||||
"golang.org/x/crypto/bcrypt"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestParallelProcessor_CreateUsersInParallel(t *testing.T) {
|
|
||||||
const successCount = 4
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
count int
|
|
||||||
repoFactory func() repositories.UserRepository
|
|
||||||
progress *commands.ProgressIndicator
|
|
||||||
validate func(t *testing.T, got []database.User)
|
|
||||||
wantErr bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "creates users with required fields",
|
|
||||||
count: successCount,
|
|
||||||
repoFactory: func() repositories.UserRepository {
|
|
||||||
base := testutils.NewMockUserRepository()
|
|
||||||
return newFakeUserRepo(base, 0, nil)
|
|
||||||
},
|
|
||||||
progress: nil,
|
|
||||||
validate: func(t *testing.T, got []database.User) {
|
|
||||||
t.Helper()
|
|
||||||
if len(got) != successCount {
|
|
||||||
t.Fatalf("expected %d users, got %d", successCount, len(got))
|
|
||||||
}
|
|
||||||
usernames := make(map[string]bool)
|
|
||||||
for i, user := range got {
|
|
||||||
if user.Username == "" {
|
|
||||||
t.Errorf("user %d expected non-empty username", i)
|
|
||||||
}
|
|
||||||
if len(user.Username) < 6 || user.Username[:5] != "user_" {
|
|
||||||
t.Errorf("user %d username should start with 'user_', got %q", i, user.Username)
|
|
||||||
}
|
|
||||||
if usernames[user.Username] {
|
|
||||||
t.Errorf("user %d duplicate username: %q", i, user.Username)
|
|
||||||
}
|
|
||||||
usernames[user.Username] = true
|
|
||||||
|
|
||||||
if user.Email == "" {
|
|
||||||
t.Errorf("user %d expected non-empty email", i)
|
|
||||||
}
|
|
||||||
if len(user.Email) < 20 || user.Email[:5] != "user_" || user.Email[len(user.Email)-12:] != "@goyco.local" {
|
|
||||||
t.Errorf("user %d email should match pattern 'user_*@goyco.local', got %q", i, user.Email)
|
|
||||||
}
|
|
||||||
if !user.EmailVerified {
|
|
||||||
t.Errorf("user %d expected EmailVerified to be true", i)
|
|
||||||
}
|
|
||||||
if user.ID == 0 {
|
|
||||||
t.Errorf("user %d expected non-zero ID", i)
|
|
||||||
}
|
|
||||||
if user.Password == "" {
|
|
||||||
t.Errorf("user %d expected hashed password to be populated", i)
|
|
||||||
}
|
|
||||||
if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte("password123")); err != nil {
|
|
||||||
t.Errorf("user %d password not hashed correctly: %v", i, err)
|
|
||||||
}
|
|
||||||
if user.CreatedAt.IsZero() {
|
|
||||||
t.Errorf("user %d expected CreatedAt to be set", i)
|
|
||||||
}
|
|
||||||
if user.UpdatedAt.IsZero() {
|
|
||||||
t.Errorf("user %d expected UpdatedAt to be set", i)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "returns error when repository create fails",
|
|
||||||
count: 3,
|
|
||||||
repoFactory: func() repositories.UserRepository {
|
|
||||||
base := testutils.NewMockUserRepository()
|
|
||||||
return newFakeUserRepo(base, 1, errors.New("create failure"))
|
|
||||||
},
|
|
||||||
progress: nil,
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
repo := tt.repoFactory()
|
|
||||||
p := commands.NewParallelProcessor()
|
|
||||||
passwordHash, err := bcrypt.GenerateFromPassword([]byte("password123"), bcrypt.DefaultCost)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("failed to generate password hash: %v", err)
|
|
||||||
}
|
|
||||||
p.SetPasswordHash(string(passwordHash))
|
|
||||||
got, gotErr := p.CreateUsersInParallel(repo, tt.count, tt.progress)
|
|
||||||
if gotErr != nil {
|
|
||||||
if !tt.wantErr {
|
|
||||||
t.Errorf("CreateUsersInParallel() failed: %v", gotErr)
|
|
||||||
}
|
|
||||||
if got != nil {
|
|
||||||
t.Error("expected nil result when error occurs")
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if tt.wantErr {
|
|
||||||
t.Fatal("CreateUsersInParallel() succeeded unexpectedly")
|
|
||||||
}
|
|
||||||
if tt.validate != nil {
|
|
||||||
tt.validate(t, got)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type fakeUserRepo struct {
|
|
||||||
repositories.UserRepository
|
|
||||||
mu sync.Mutex
|
|
||||||
failAt int
|
|
||||||
err error
|
|
||||||
calls int
|
|
||||||
}
|
|
||||||
|
|
||||||
func newFakeUserRepo(base repositories.UserRepository, failAt int, err error) *fakeUserRepo {
|
|
||||||
return &fakeUserRepo{
|
|
||||||
UserRepository: base,
|
|
||||||
failAt: failAt,
|
|
||||||
err: err,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *fakeUserRepo) Create(user *database.User) error {
|
|
||||||
r.mu.Lock()
|
|
||||||
defer r.mu.Unlock()
|
|
||||||
r.calls++
|
|
||||||
if r.failAt > 0 && r.calls >= r.failAt {
|
|
||||||
return r.err
|
|
||||||
}
|
|
||||||
return r.UserRepository.Create(user)
|
|
||||||
}
|
|
||||||
@@ -56,16 +56,16 @@ func newProgressIndicatorWithClock(total int, description string, c clock) *Prog
|
|||||||
|
|
||||||
func (p *ProgressIndicator) Update(current int) {
|
func (p *ProgressIndicator) Update(current int) {
|
||||||
p.mu.Lock()
|
p.mu.Lock()
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.current = current
|
p.current = current
|
||||||
now := p.clock.Now()
|
now := p.clock.Now()
|
||||||
|
|
||||||
if now.Sub(p.lastUpdate) < 100*time.Millisecond {
|
if now.Sub(p.lastUpdate) < 100*time.Millisecond {
|
||||||
|
p.mu.Unlock()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
p.lastUpdate = now
|
p.lastUpdate = now
|
||||||
|
p.mu.Unlock()
|
||||||
p.display()
|
p.display()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,15 +44,14 @@ func captureOutput(fn func()) string {
|
|||||||
r, w, _ := os.Pipe()
|
r, w, _ := os.Pipe()
|
||||||
os.Stdout = w
|
os.Stdout = w
|
||||||
|
|
||||||
defer func() {
|
fn()
|
||||||
|
|
||||||
_ = w.Close()
|
_ = w.Close()
|
||||||
os.Stdout = old
|
os.Stdout = old
|
||||||
}()
|
|
||||||
|
|
||||||
fn()
|
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
_, _ = io.Copy(&buf, r)
|
_, _ = io.Copy(&buf, r)
|
||||||
|
_ = r.Close()
|
||||||
return buf.String()
|
return buf.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,29 +6,17 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/lib/pq"
|
||||||
|
"golang.org/x/crypto/bcrypt"
|
||||||
|
"gorm.io/gorm"
|
||||||
"goyco/internal/config"
|
"goyco/internal/config"
|
||||||
"goyco/internal/database"
|
"goyco/internal/database"
|
||||||
"goyco/internal/repositories"
|
"goyco/internal/repositories"
|
||||||
|
|
||||||
"golang.org/x/crypto/bcrypt"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
|
||||||
seedRandSource *rand.Rand
|
|
||||||
seedRandOnce sync.Once
|
|
||||||
)
|
|
||||||
|
|
||||||
func initSeedRand() {
|
|
||||||
seedRandOnce.Do(func() {
|
|
||||||
seed := time.Now().UnixNano()
|
|
||||||
seedRandSource = rand.New(rand.NewSource(seed))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func HandleSeedCommand(cfg *config.Config, name string, args []string) error {
|
func HandleSeedCommand(cfg *config.Config, name string, args []string) error {
|
||||||
fs := newFlagSet(name, printSeedUsage)
|
fs := newFlagSet(name, printSeedUsage)
|
||||||
if err := parseCommand(fs, args, name); err != nil {
|
if err := parseCommand(fs, args, name); err != nil {
|
||||||
@@ -39,11 +27,13 @@ func HandleSeedCommand(cfg *config.Config, name string, args []string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return withDatabase(cfg, func(db *gorm.DB) error {
|
return withDatabase(cfg, func(db *gorm.DB) error {
|
||||||
userRepo := repositories.NewUserRepository(db)
|
return db.Transaction(func(tx *gorm.DB) error {
|
||||||
postRepo := repositories.NewPostRepository(db)
|
userRepo := repositories.NewUserRepository(db).WithTx(tx)
|
||||||
voteRepo := repositories.NewVoteRepository(db)
|
postRepo := repositories.NewPostRepository(db).WithTx(tx)
|
||||||
|
voteRepo := repositories.NewVoteRepository(db).WithTx(tx)
|
||||||
return runSeedCommand(userRepo, postRepo, voteRepo, fs.Args())
|
return runSeedCommand(userRepo, postRepo, voteRepo, fs.Args())
|
||||||
})
|
})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func runSeedCommand(userRepo repositories.UserRepository, postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, args []string) error {
|
func runSeedCommand(userRepo repositories.UserRepository, postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, args []string) error {
|
||||||
@@ -72,45 +62,37 @@ func printSeedUsage() {
|
|||||||
fmt.Fprintln(os.Stderr, " --votes-per-post: average votes per post (default: 15)")
|
fmt.Fprintln(os.Stderr, " --votes-per-post: average votes per post (default: 15)")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func clampFlagValue(value *int, min int, name string) {
|
||||||
|
if *value < min {
|
||||||
|
if !IsJSONOutput() {
|
||||||
|
fmt.Fprintf(os.Stderr, "Warning: --%s value %d is too low, clamping to %d\n", name, *value, min)
|
||||||
|
}
|
||||||
|
*value = min
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func seedDatabase(userRepo repositories.UserRepository, postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, args []string) error {
|
func seedDatabase(userRepo repositories.UserRepository, postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, args []string) error {
|
||||||
fs := flag.NewFlagSet("seed database", flag.ContinueOnError)
|
fs := flag.NewFlagSet("seed database", flag.ContinueOnError)
|
||||||
numPosts := fs.Int("posts", 40, "number of posts to create")
|
numPosts := fs.Int("posts", 40, "number of posts to create")
|
||||||
numUsers := fs.Int("users", 5, "number of additional users to create")
|
numUsers := fs.Int("users", 5, "number of additional users to create")
|
||||||
votesPerPost := fs.Int("votes-per-post", 15, "average votes per post")
|
votesPerPost := fs.Int("votes-per-post", 15, "average votes per post")
|
||||||
fs.SetOutput(os.Stderr)
|
fs.SetOutput(os.Stderr)
|
||||||
|
fs.Usage = func() {
|
||||||
|
fmt.Fprintln(os.Stderr, "Usage: goyco seed database [--posts <n>] [--users <n>] [--votes-per-post <n>]")
|
||||||
|
fmt.Fprintln(os.Stderr, "\nOptions:")
|
||||||
|
fs.PrintDefaults()
|
||||||
|
}
|
||||||
|
|
||||||
if err := fs.Parse(args); err != nil {
|
if err := fs.Parse(args); err != nil {
|
||||||
|
if errors.Is(err, flag.ErrHelp) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
originalUsers := *numUsers
|
clampFlagValue(numUsers, 0, "users")
|
||||||
originalPosts := *numPosts
|
clampFlagValue(numPosts, 1, "posts")
|
||||||
originalVotesPerPost := *votesPerPost
|
clampFlagValue(votesPerPost, 0, "votes-per-post")
|
||||||
|
|
||||||
if *numUsers < 0 {
|
|
||||||
if !IsJSONOutput() {
|
|
||||||
fmt.Fprintf(os.Stderr, "Warning: --users value %d is negative, clamping to 0\n", *numUsers)
|
|
||||||
}
|
|
||||||
*numUsers = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
if *numPosts <= 0 {
|
|
||||||
if !IsJSONOutput() {
|
|
||||||
fmt.Fprintf(os.Stderr, "Warning: --posts value %d is too low, clamping to 1\n", *numPosts)
|
|
||||||
}
|
|
||||||
*numPosts = 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if *votesPerPost < 0 {
|
|
||||||
if !IsJSONOutput() {
|
|
||||||
fmt.Fprintf(os.Stderr, "Warning: --votes-per-post value %d is negative, clamping to 0\n", *votesPerPost)
|
|
||||||
}
|
|
||||||
*votesPerPost = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
if !IsJSONOutput() && (originalUsers != *numUsers || originalPosts != *numPosts || originalVotesPerPost != *votesPerPost) {
|
|
||||||
fmt.Fprintf(os.Stderr, "Using clamped values: --users=%d --posts=%d --votes-per-post=%d\n", *numUsers, *numPosts, *votesPerPost)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !IsJSONOutput() {
|
if !IsJSONOutput() {
|
||||||
fmt.Println("Starting database seeding...")
|
fmt.Println("Starting database seeding...")
|
||||||
@@ -129,71 +111,35 @@ func seedDatabase(userRepo repositories.UserRepository, postRepo repositories.Po
|
|||||||
return fmt.Errorf("precompute user password hash: %w", err)
|
return fmt.Errorf("precompute user password hash: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
spinner := NewSpinner("Creating seed user")
|
|
||||||
if !IsJSONOutput() {
|
|
||||||
spinner.Spin()
|
|
||||||
}
|
|
||||||
|
|
||||||
seedUser, err := ensureSeedUser(userRepo, string(seedPasswordHash))
|
seedUser, err := ensureSeedUser(userRepo, string(seedPasswordHash))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !IsJSONOutput() {
|
|
||||||
spinner.Complete()
|
|
||||||
}
|
|
||||||
return fmt.Errorf("ensure seed user: %w", err)
|
return fmt.Errorf("ensure seed user: %w", err)
|
||||||
}
|
}
|
||||||
if !IsJSONOutput() {
|
if !IsJSONOutput() {
|
||||||
spinner.Complete()
|
|
||||||
fmt.Printf("Seed user ready: ID=%d Username=%s\n", seedUser.ID, seedUser.Username)
|
fmt.Printf("Seed user ready: ID=%d Username=%s\n", seedUser.ID, seedUser.Username)
|
||||||
}
|
}
|
||||||
|
|
||||||
processor := NewParallelProcessor()
|
generator := newSeedGenerator(string(userPasswordHash))
|
||||||
processor.SetPasswordHash(string(userPasswordHash))
|
allUsers := []database.User{*seedUser}
|
||||||
|
|
||||||
var progress *ProgressIndicator
|
users, err := createUsers(generator, userRepo, *numUsers, "Creating users")
|
||||||
if !IsJSONOutput() && *numUsers > 0 {
|
|
||||||
progress = NewProgressIndicator(*numUsers, "Creating users (parallel)")
|
|
||||||
}
|
|
||||||
users, err := processor.CreateUsersInParallel(userRepo, *numUsers, progress)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("create random users: %w", err)
|
return err
|
||||||
}
|
|
||||||
if !IsJSONOutput() && progress != nil {
|
|
||||||
progress.Complete()
|
|
||||||
}
|
}
|
||||||
|
allUsers = append(allUsers, users...)
|
||||||
|
|
||||||
allUsers := append([]database.User{*seedUser}, users...)
|
posts, err := createPosts(generator, postRepo, seedUser.ID, *numPosts, "Creating posts")
|
||||||
|
|
||||||
if !IsJSONOutput() && *numPosts > 0 {
|
|
||||||
progress = NewProgressIndicator(*numPosts, "Creating posts (parallel)")
|
|
||||||
}
|
|
||||||
posts, err := processor.CreatePostsInParallel(postRepo, seedUser.ID, *numPosts, progress)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("create random posts: %w", err)
|
return err
|
||||||
}
|
|
||||||
if !IsJSONOutput() && progress != nil {
|
|
||||||
progress.Complete()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if !IsJSONOutput() && len(posts) > 0 {
|
votes, err := createVotes(generator, voteRepo, allUsers, posts, *votesPerPost, "Creating votes")
|
||||||
progress = NewProgressIndicator(len(posts), "Creating votes (parallel)")
|
|
||||||
}
|
|
||||||
votes, err := processor.CreateVotesInParallel(voteRepo, allUsers, posts, *votesPerPost, progress)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("create random votes: %w", err)
|
return err
|
||||||
}
|
|
||||||
if !IsJSONOutput() && progress != nil {
|
|
||||||
progress.Complete()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if !IsJSONOutput() && len(posts) > 0 {
|
if err := updateScores(generator, postRepo, voteRepo, posts, "Updating scores"); err != nil {
|
||||||
progress = NewProgressIndicator(len(posts), "Updating scores (parallel)")
|
return err
|
||||||
}
|
|
||||||
err = processor.UpdatePostScoresInParallel(postRepo, voteRepo, posts, progress)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("update post scores: %w", err)
|
|
||||||
}
|
|
||||||
if !IsJSONOutput() && progress != nil {
|
|
||||||
progress.Complete()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := validateSeedConsistency(voteRepo, allUsers, posts); err != nil {
|
if err := validateSeedConsistency(voteRepo, allUsers, posts); err != nil {
|
||||||
@@ -225,11 +171,15 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func ensureSeedUser(userRepo repositories.UserRepository, passwordHash string) (*database.User, error) {
|
func ensureSeedUser(userRepo repositories.UserRepository, passwordHash string) (*database.User, error) {
|
||||||
if user, err := userRepo.GetByUsername(seedUsername); err == nil {
|
user, err := userRepo.GetByUsername(seedUsername)
|
||||||
|
if err == nil {
|
||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil, fmt.Errorf("failed to check if seed user exists: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
user := &database.User{
|
user = &database.User{
|
||||||
Username: seedUsername,
|
Username: seedUsername,
|
||||||
Email: seedEmail,
|
Email: seedEmail,
|
||||||
Password: passwordHash,
|
Password: passwordHash,
|
||||||
@@ -243,10 +193,6 @@ func ensureSeedUser(userRepo repositories.UserRepository, passwordHash string) (
|
|||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getVoteCounts(voteRepo repositories.VoteRepository, postID uint) (int, int, error) {
|
|
||||||
return voteRepo.GetVoteCountsByPostID(postID)
|
|
||||||
}
|
|
||||||
|
|
||||||
func validateSeedConsistency(voteRepo repositories.VoteRepository, users []database.User, posts []database.Post) error {
|
func validateSeedConsistency(voteRepo repositories.VoteRepository, users []database.User, posts []database.Post) error {
|
||||||
userIDSet := make(map[uint]struct{}, len(users))
|
userIDSet := make(map[uint]struct{}, len(users))
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
@@ -259,8 +205,11 @@ func validateSeedConsistency(voteRepo repositories.VoteRepository, users []datab
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, post := range posts {
|
for _, post := range posts {
|
||||||
if err := validatePost(post, userIDSet); err != nil {
|
if post.AuthorID == nil {
|
||||||
return err
|
return fmt.Errorf("post %d has no author ID", post.ID)
|
||||||
|
}
|
||||||
|
if _, exists := userIDSet[*post.AuthorID]; !exists {
|
||||||
|
return fmt.Errorf("post %d references non-existent author ID %d", post.ID, *post.AuthorID)
|
||||||
}
|
}
|
||||||
|
|
||||||
votes, err := voteRepo.GetByPostID(post.ID)
|
votes, err := voteRepo.GetByPostID(post.ID)
|
||||||
@@ -268,46 +217,293 @@ func validateSeedConsistency(voteRepo repositories.VoteRepository, users []datab
|
|||||||
return fmt.Errorf("failed to retrieve votes for post %d: %w", post.ID, err)
|
return fmt.Errorf("failed to retrieve votes for post %d: %w", post.ID, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := validateVotesForPost(post.ID, votes, userIDSet, postIDSet); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func validatePost(post database.Post, userIDSet map[uint]struct{}) error {
|
|
||||||
if post.AuthorID == nil {
|
|
||||||
return fmt.Errorf("post %d has no author ID", post.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, exists := userIDSet[*post.AuthorID]; !exists {
|
|
||||||
return fmt.Errorf("post %d references non-existent author ID %d", post.ID, *post.AuthorID)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func validateVotesForPost(postID uint, votes []database.Vote, userIDSet map[uint]struct{}, postIDSet map[uint]struct{}) error {
|
|
||||||
for _, vote := range votes {
|
for _, vote := range votes {
|
||||||
if vote.PostID != postID {
|
if vote.PostID != post.ID {
|
||||||
return fmt.Errorf("vote %d references post ID %d but was retrieved for post %d", vote.ID, vote.PostID, postID)
|
return fmt.Errorf("vote %d references post ID %d but was retrieved for post %d", vote.ID, vote.PostID, post.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, exists := postIDSet[vote.PostID]; !exists {
|
if _, exists := postIDSet[vote.PostID]; !exists {
|
||||||
return fmt.Errorf("vote %d references non-existent post ID %d", vote.ID, vote.PostID)
|
return fmt.Errorf("vote %d references non-existent post ID %d", vote.ID, vote.PostID)
|
||||||
}
|
}
|
||||||
|
|
||||||
if vote.UserID != nil {
|
if vote.UserID != nil {
|
||||||
if _, exists := userIDSet[*vote.UserID]; !exists {
|
if _, exists := userIDSet[*vote.UserID]; !exists {
|
||||||
return fmt.Errorf("vote %d references non-existent user ID %d", vote.ID, *vote.UserID)
|
return fmt.Errorf("vote %d references non-existent user ID %d", vote.ID, *vote.UserID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if vote.Type != database.VoteUp && vote.Type != database.VoteDown {
|
if vote.Type != database.VoteUp && vote.Type != database.VoteDown {
|
||||||
return fmt.Errorf("vote %d has invalid type %q", vote.ID, vote.Type)
|
return fmt.Errorf("vote %d has invalid type %q", vote.ID, vote.Type)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type seedGenerator struct {
|
||||||
|
passwordHash string
|
||||||
|
randSource *rand.Rand
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSeedGenerator(passwordHash string) *seedGenerator {
|
||||||
|
seed := time.Now().UnixNano()
|
||||||
|
return &seedGenerator{
|
||||||
|
passwordHash: passwordHash,
|
||||||
|
randSource: rand.New(rand.NewSource(seed)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func isRetryableError(err error, keywords ...string) bool {
|
||||||
|
if err == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
errMsg := strings.ToLower(err.Error())
|
||||||
|
if errors.Is(err, gorm.ErrDuplicatedKey) {
|
||||||
|
for _, keyword := range keywords {
|
||||||
|
if strings.Contains(errMsg, keyword) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
var pqErr *pq.Error
|
||||||
|
if errors.As(err, &pqErr) && pqErr.Code == "23505" {
|
||||||
|
constraintLower := strings.ToLower(pqErr.Constraint)
|
||||||
|
errMsgLower := strings.ToLower(pqErr.Message)
|
||||||
|
for _, keyword := range keywords {
|
||||||
|
if strings.Contains(constraintLower, keyword) || strings.Contains(errMsgLower, keyword) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.Contains(errMsg, "duplicate") {
|
||||||
|
for _, keyword := range keywords {
|
||||||
|
if strings.Contains(errMsg, keyword) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func createUsers(g *seedGenerator, userRepo repositories.UserRepository, count int, desc string) ([]database.User, error) {
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
progress := maybeProgress(count, desc)
|
||||||
|
users := make([]database.User, 0, count)
|
||||||
|
for i := 0; i < count; i++ {
|
||||||
|
user, err := g.createSingleUser(userRepo, i+1)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("create random user: %w", err)
|
||||||
|
}
|
||||||
|
users = append(users, user)
|
||||||
|
if progress != nil {
|
||||||
|
progress.Increment()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if progress != nil {
|
||||||
|
progress.Complete()
|
||||||
|
}
|
||||||
|
return users, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func createPosts(g *seedGenerator, postRepo repositories.PostRepository, authorID uint, count int, desc string) ([]database.Post, error) {
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
progress := maybeProgress(count, desc)
|
||||||
|
posts := make([]database.Post, 0, count)
|
||||||
|
for i := 0; i < count; i++ {
|
||||||
|
post, err := g.createSinglePost(postRepo, authorID, i+1)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("create random post: %w", err)
|
||||||
|
}
|
||||||
|
posts = append(posts, post)
|
||||||
|
if progress != nil {
|
||||||
|
progress.Increment()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if progress != nil {
|
||||||
|
progress.Complete()
|
||||||
|
}
|
||||||
|
return posts, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func createVotes(g *seedGenerator, voteRepo repositories.VoteRepository, users []database.User, posts []database.Post, avgVotesPerPost int, desc string) (int, error) {
|
||||||
|
if len(posts) == 0 {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
progress := maybeProgress(len(posts), desc)
|
||||||
|
votes := 0
|
||||||
|
for _, post := range posts {
|
||||||
|
count, err := g.createVotesForPost(voteRepo, users, post, avgVotesPerPost)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("create random votes for post %d: %w", post.ID, err)
|
||||||
|
}
|
||||||
|
votes += count
|
||||||
|
if progress != nil {
|
||||||
|
progress.Increment()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if progress != nil {
|
||||||
|
progress.Complete()
|
||||||
|
}
|
||||||
|
return votes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateScores(g *seedGenerator, postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, posts []database.Post, desc string) error {
|
||||||
|
if len(posts) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
progress := maybeProgress(len(posts), desc)
|
||||||
|
for _, post := range posts {
|
||||||
|
if err := g.updateSinglePostScore(postRepo, voteRepo, post); err != nil {
|
||||||
|
return fmt.Errorf("update post scores: %w", err)
|
||||||
|
}
|
||||||
|
if progress != nil {
|
||||||
|
progress.Increment()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if progress != nil {
|
||||||
|
progress.Complete()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func maybeProgress(count int, desc string) *ProgressIndicator {
|
||||||
|
if !IsJSONOutput() && count > 0 {
|
||||||
|
return NewProgressIndicator(count, desc)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *seedGenerator) generateRandomIdentifier() string {
|
||||||
|
const length = 12
|
||||||
|
const chars = "abcdefghijklmnopqrstuvwxyz0123456789"
|
||||||
|
identifier := make([]byte, length)
|
||||||
|
for i := range identifier {
|
||||||
|
identifier[i] = chars[g.randSource.Intn(len(chars))]
|
||||||
|
}
|
||||||
|
return string(identifier)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *seedGenerator) createSingleUser(userRepo repositories.UserRepository, index int) (database.User, error) {
|
||||||
|
const maxRetries = 10
|
||||||
|
var lastErr error
|
||||||
|
for attempt := range maxRetries {
|
||||||
|
randomID := g.generateRandomIdentifier()
|
||||||
|
user := &database.User{
|
||||||
|
Username: fmt.Sprintf("user_%s", randomID),
|
||||||
|
Email: fmt.Sprintf("user_%s@goyco.local", randomID),
|
||||||
|
Password: g.passwordHash,
|
||||||
|
EmailVerified: true,
|
||||||
|
}
|
||||||
|
if err := userRepo.Create(user); err != nil {
|
||||||
|
lastErr = err
|
||||||
|
if !isRetryableError(err, "username", "email", "users_username_key", "users_email_key") {
|
||||||
|
return database.User{}, fmt.Errorf("failed to create user (attempt %d/%d): %w", attempt+1, maxRetries, err)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return *user, nil
|
||||||
|
}
|
||||||
|
return database.User{}, fmt.Errorf("failed to create user after %d attempts: %w", maxRetries, lastErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
sampleTitles = []string{"Amazing JavaScript Framework", "Python Best Practices", "Go Performance Tips", "Database Optimization", "Web Security Guide", "Machine Learning Basics", "Cloud Architecture", "DevOps Automation", "API Design Patterns", "Frontend Optimization", "Backend Scaling", "Container Orchestration", "Microservices Architecture", "Testing Strategies", "Code Review Process", "Version Control Best Practices", "Continuous Integration", "Monitoring and Alerting", "Error Handling Patterns", "Data Structures Explained"}
|
||||||
|
sampleDomains = []string{"example.com", "techblog.org", "devguide.net", "programming.io", "codeexamples.com", "tutorialhub.org", "bestpractices.dev", "learnprogramming.net", "codingtips.org", "softwareengineering.com"}
|
||||||
|
)
|
||||||
|
|
||||||
|
func (g *seedGenerator) createSinglePost(postRepo repositories.PostRepository, authorID uint, index int) (database.Post, error) {
|
||||||
|
title := sampleTitles[index%len(sampleTitles)]
|
||||||
|
if index >= len(sampleTitles) {
|
||||||
|
title = fmt.Sprintf("%s - Part %d", title, (index/len(sampleTitles))+1)
|
||||||
|
}
|
||||||
|
domain := sampleDomains[index%len(sampleDomains)]
|
||||||
|
content := fmt.Sprintf("Autogenerated seed post #%d\n\nThis is sample content for testing purposes. The post discusses %s and provides valuable insights.", index, title)
|
||||||
|
|
||||||
|
const maxRetries = 10
|
||||||
|
var lastErr error
|
||||||
|
for attempt := range maxRetries {
|
||||||
|
randomID := g.generateRandomIdentifier()
|
||||||
|
post := &database.Post{
|
||||||
|
Title: title,
|
||||||
|
URL: fmt.Sprintf("https://%s/article/%s", domain, randomID),
|
||||||
|
Content: content,
|
||||||
|
AuthorID: &authorID,
|
||||||
|
UpVotes: 0,
|
||||||
|
DownVotes: 0,
|
||||||
|
Score: 0,
|
||||||
|
}
|
||||||
|
if err := postRepo.Create(post); err != nil {
|
||||||
|
lastErr = err
|
||||||
|
if !isRetryableError(err, "url", "posts_url_key") {
|
||||||
|
return database.Post{}, fmt.Errorf("failed to create post (attempt %d/%d): %w", attempt+1, maxRetries, err)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return *post, nil
|
||||||
|
}
|
||||||
|
return database.Post{}, fmt.Errorf("failed to create post after %d attempts: %w", maxRetries, lastErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *seedGenerator) createVotesForPost(voteRepo repositories.VoteRepository, users []database.User, post database.Post, avgVotesPerPost int) (int, error) {
|
||||||
|
numVotes := g.randSource.Intn(avgVotesPerPost*2 + 1)
|
||||||
|
|
||||||
|
if numVotes == 0 && avgVotesPerPost > 0 {
|
||||||
|
if g.randSource.Intn(5) > 0 {
|
||||||
|
numVotes = 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
totalVotes := 0
|
||||||
|
usedUsers := make(map[uint]bool)
|
||||||
|
|
||||||
|
for i := 0; i < numVotes && len(usedUsers) < len(users); i++ {
|
||||||
|
userIdx := g.randSource.Intn(len(users))
|
||||||
|
user := users[userIdx]
|
||||||
|
|
||||||
|
if usedUsers[user.ID] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
usedUsers[user.ID] = true
|
||||||
|
|
||||||
|
voteTypeInt := g.randSource.Intn(10)
|
||||||
|
var voteType database.VoteType
|
||||||
|
if voteTypeInt < 7 {
|
||||||
|
voteType = database.VoteUp
|
||||||
|
} else {
|
||||||
|
voteType = database.VoteDown
|
||||||
|
}
|
||||||
|
|
||||||
|
vote := &database.Vote{
|
||||||
|
UserID: &user.ID,
|
||||||
|
PostID: post.ID,
|
||||||
|
Type: voteType,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := voteRepo.CreateOrUpdate(vote); err != nil {
|
||||||
|
return totalVotes, fmt.Errorf("create or update vote: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
totalVotes++
|
||||||
|
}
|
||||||
|
|
||||||
|
return totalVotes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *seedGenerator) updateSinglePostScore(postRepo repositories.PostRepository, voteRepo repositories.VoteRepository, post database.Post) error {
|
||||||
|
upVotes, downVotes, err := voteRepo.GetVoteCountsByPostID(post.ID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("get vote counts: %w", err)
|
||||||
|
}
|
||||||
|
post.UpVotes = upVotes
|
||||||
|
post.DownVotes = downVotes
|
||||||
|
post.Score = upVotes - downVotes
|
||||||
|
return postRepo.Update(&post)
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,8 +2,11 @@ package commands
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"goyco/internal/database"
|
"goyco/internal/database"
|
||||||
"goyco/internal/repositories"
|
"goyco/internal/repositories"
|
||||||
@@ -13,6 +16,20 @@ import (
|
|||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
seedRandSource *rand.Rand
|
||||||
|
seedRandOnce sync.Once
|
||||||
|
)
|
||||||
|
|
||||||
|
const testPasswordHash = "test_password_hash"
|
||||||
|
|
||||||
|
func initSeedRand() {
|
||||||
|
seedRandOnce.Do(func() {
|
||||||
|
seed := time.Now().UnixNano()
|
||||||
|
seedRandSource = rand.New(rand.NewSource(seed))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func TestSeedCommand(t *testing.T) {
|
func TestSeedCommand(t *testing.T) {
|
||||||
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
|
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -46,11 +63,11 @@ func TestSeedCommand(t *testing.T) {
|
|||||||
seedUserCount := 0
|
seedUserCount := 0
|
||||||
var seedUser *database.User
|
var seedUser *database.User
|
||||||
regularUserCount := 0
|
regularUserCount := 0
|
||||||
for i := range users {
|
for idx := range users {
|
||||||
if users[i].Username == "seed_admin" {
|
if users[idx].Username == seedUsername {
|
||||||
seedUserCount++
|
seedUserCount++
|
||||||
seedUser = &users[i]
|
seedUser = &users[idx]
|
||||||
} else if strings.HasPrefix(users[i].Username, "user_") {
|
} else if strings.HasPrefix(users[idx].Username, "user_") {
|
||||||
regularUserCount++
|
regularUserCount++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -63,12 +80,12 @@ func TestSeedCommand(t *testing.T) {
|
|||||||
t.Fatal("Expected seed user to be created")
|
t.Fatal("Expected seed user to be created")
|
||||||
}
|
}
|
||||||
|
|
||||||
if seedUser.Username != "seed_admin" {
|
if seedUser.Username != seedUsername {
|
||||||
t.Errorf("Expected username to be 'seed_admin', got '%s'", seedUser.Username)
|
t.Errorf("Expected username to be %q, got '%s'", seedUsername, seedUser.Username)
|
||||||
}
|
}
|
||||||
|
|
||||||
if seedUser.Email != "seed_admin@goyco.local" {
|
if seedUser.Email != seedEmail {
|
||||||
t.Errorf("Expected email to be 'seed_admin@goyco.local', got '%s'", seedUser.Email)
|
t.Errorf("Expected email to be %q, got '%s'", seedEmail, seedUser.Email)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !seedUser.EmailVerified {
|
if !seedUser.EmailVerified {
|
||||||
@@ -88,20 +105,20 @@ func TestSeedCommand(t *testing.T) {
|
|||||||
t.Errorf("Expected 5 posts, got %d", len(posts))
|
t.Errorf("Expected 5 posts, got %d", len(posts))
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, post := range posts {
|
for idx, post := range posts {
|
||||||
if post.Title == "" {
|
if post.Title == "" {
|
||||||
t.Errorf("Post %d has empty title", i)
|
t.Errorf("Post %d has empty title", idx)
|
||||||
}
|
}
|
||||||
if post.URL == "" {
|
if post.URL == "" {
|
||||||
t.Errorf("Post %d has empty URL", i)
|
t.Errorf("Post %d has empty URL", idx)
|
||||||
}
|
}
|
||||||
if post.AuthorID == nil || *post.AuthorID != seedUser.ID {
|
if post.AuthorID == nil || *post.AuthorID != seedUser.ID {
|
||||||
t.Errorf("Post %d has wrong author ID: expected %d, got %v", i, seedUser.ID, post.AuthorID)
|
t.Errorf("Post %d has wrong author ID: expected %d, got %v", idx, seedUser.ID, post.AuthorID)
|
||||||
}
|
}
|
||||||
|
|
||||||
expectedScore := post.UpVotes - post.DownVotes
|
expectedScore := post.UpVotes - post.DownVotes
|
||||||
if post.Score != expectedScore {
|
if post.Score != expectedScore {
|
||||||
t.Errorf("Post %d has incorrect score: expected %d, got %d", i, expectedScore, post.Score)
|
t.Errorf("Post %d has incorrect score: expected %d, got %d", idx, expectedScore, post.Score)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,11 +150,12 @@ func TestSeedCommand(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGenerateRandomPath(t *testing.T) {
|
func TestGenerateRandomPath(t *testing.T) {
|
||||||
|
const articlePathPrefix = "/article/"
|
||||||
initSeedRand()
|
initSeedRand()
|
||||||
pathLength := seedRandSource.Intn(20)
|
pathLength := seedRandSource.Intn(20)
|
||||||
path := "/article/"
|
path := articlePathPrefix
|
||||||
|
|
||||||
for i := 0; i < pathLength+5; i++ {
|
for idx := 0; idx < pathLength+5; idx++ {
|
||||||
randomChar := seedRandSource.Intn(26)
|
randomChar := seedRandSource.Intn(26)
|
||||||
path += string(rune('a' + randomChar))
|
path += string(rune('a' + randomChar))
|
||||||
}
|
}
|
||||||
@@ -152,13 +170,14 @@ func TestGenerateRandomPath(t *testing.T) {
|
|||||||
|
|
||||||
initSeedRand()
|
initSeedRand()
|
||||||
secondPathLength := seedRandSource.Intn(20)
|
secondPathLength := seedRandSource.Intn(20)
|
||||||
secondPath := "/article/"
|
var secondPath strings.Builder
|
||||||
for i := 0; i < secondPathLength+5; i++ {
|
secondPath.WriteString(articlePathPrefix)
|
||||||
|
for idx := 0; idx < secondPathLength+5; idx++ {
|
||||||
randomChar := seedRandSource.Intn(26)
|
randomChar := seedRandSource.Intn(26)
|
||||||
secondPath += string(rune('a' + randomChar))
|
secondPath.WriteString(string(rune('a' + randomChar)))
|
||||||
}
|
}
|
||||||
|
|
||||||
if path == secondPath {
|
if path == secondPath.String() {
|
||||||
t.Error("Generated paths should be different")
|
t.Error("Generated paths should be different")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -271,6 +290,22 @@ func TestSeedDatabaseFlagParsing(t *testing.T) {
|
|||||||
t.Errorf("zero votes-per-post should be valid, got error: %v", err)
|
t.Errorf("zero votes-per-post should be valid, got error: %v", err)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("help flag returns no error", func(t *testing.T) {
|
||||||
|
err := seedDatabase(userRepo, postRepo, voteRepo, []string{"--help"})
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("help flag should return no error, got: %v", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("short help flag returns no error", func(t *testing.T) {
|
||||||
|
err := seedDatabase(userRepo, postRepo, voteRepo, []string{"-h"})
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("short help flag should return no error, got: %v", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSeedCommandIdempotency(t *testing.T) {
|
func TestSeedCommandIdempotency(t *testing.T) {
|
||||||
@@ -302,7 +337,7 @@ func TestSeedCommandIdempotency(t *testing.T) {
|
|||||||
|
|
||||||
seedUserCount := 0
|
seedUserCount := 0
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
if user.Username == "seed_admin" {
|
if user.Username == seedUsername {
|
||||||
seedUserCount++
|
seedUserCount++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -338,10 +373,10 @@ func TestSeedCommandIdempotency(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("database remains consistent after multiple runs", func(t *testing.T) {
|
t.Run("database remains consistent after multiple runs", func(t *testing.T) {
|
||||||
for i := range 2 {
|
for idx := range 2 {
|
||||||
err := seedDatabase(userRepo, postRepo, voteRepo, []string{"--users", "0", "--posts", "1"})
|
err := seedDatabase(userRepo, postRepo, voteRepo, []string{"--users", "0", "--posts", "1"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Seed run %d failed: %v", i+1, err)
|
t.Fatalf("Seed run %d failed: %v", idx+1, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -386,9 +421,9 @@ func TestSeedCommandIdempotency(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func findSeedUser(users []database.User) *database.User {
|
func findSeedUser(users []database.User) *database.User {
|
||||||
for i := range users {
|
for idx := range users {
|
||||||
if users[i].Username == "seed_admin" {
|
if users[idx].Username == seedUsername {
|
||||||
return &users[i]
|
return &users[idx]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -488,14 +523,14 @@ func TestEnsureSeedUser(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
userRepo := repositories.NewUserRepository(db)
|
userRepo := repositories.NewUserRepository(db)
|
||||||
passwordHash := "test_password_hash"
|
passwordHash := testPasswordHash
|
||||||
|
|
||||||
firstUser, err := ensureSeedUser(userRepo, passwordHash)
|
firstUser, err := ensureSeedUser(userRepo, passwordHash)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Failed to create seed user: %v", err)
|
t.Fatalf("Failed to create seed user: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if firstUser.Username != "seed_admin" || firstUser.Email != "seed_admin@goyco.local" || firstUser.Password != passwordHash || !firstUser.EmailVerified {
|
if firstUser.Username != seedUsername || firstUser.Email != seedEmail || firstUser.Password != passwordHash || !firstUser.EmailVerified {
|
||||||
t.Errorf("Invalid seed user: username=%s, email=%s, password matches=%v, emailVerified=%v",
|
t.Errorf("Invalid seed user: username=%s, email=%s, password matches=%v, emailVerified=%v",
|
||||||
firstUser.Username, firstUser.Email, firstUser.Password == passwordHash, firstUser.EmailVerified)
|
firstUser.Username, firstUser.Email, firstUser.Password == passwordHash, firstUser.EmailVerified)
|
||||||
}
|
}
|
||||||
@@ -509,9 +544,9 @@ func TestEnsureSeedUser(t *testing.T) {
|
|||||||
t.Errorf("Expected same user to be reused (ID %d), got different user (ID %d)", firstUser.ID, secondUser.ID)
|
t.Errorf("Expected same user to be reused (ID %d), got different user (ID %d)", firstUser.ID, secondUser.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := 0; i < 3; i++ {
|
for idx := range 3 {
|
||||||
if _, err := ensureSeedUser(userRepo, passwordHash); err != nil {
|
if _, err := ensureSeedUser(userRepo, passwordHash); err != nil {
|
||||||
t.Fatalf("Call %d failed: %v", i+1, err)
|
t.Fatalf("Call %d failed: %v", idx+1, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -522,7 +557,7 @@ func TestEnsureSeedUser(t *testing.T) {
|
|||||||
|
|
||||||
seedUserCount := 0
|
seedUserCount := 0
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
if user.Username == "seed_admin" {
|
if user.Username == seedUsername {
|
||||||
seedUserCount++
|
seedUserCount++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -531,3 +566,25 @@ func TestEnsureSeedUser(t *testing.T) {
|
|||||||
t.Errorf("Expected exactly 1 seed user, got %d", seedUserCount)
|
t.Errorf("Expected exactly 1 seed user, got %d", seedUserCount)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEnsureSeedUser_HandlesDatabaseErrors(t *testing.T) {
|
||||||
|
userRepo := testutils.NewMockUserRepository()
|
||||||
|
passwordHash := testPasswordHash
|
||||||
|
|
||||||
|
dbError := fmt.Errorf("database connection failed")
|
||||||
|
|
||||||
|
userRepo.SetGetByUsernameError(dbError)
|
||||||
|
|
||||||
|
_, err := ensureSeedUser(userRepo, passwordHash)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("Expected error when GetByUsername returns database error")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(err.Error(), "failed to check if seed user exists") {
|
||||||
|
t.Errorf("Expected error message about checking seed user, got: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(err.Error(), dbError.Error()) {
|
||||||
|
t.Errorf("Expected error to wrap original database error, got: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"unicode/utf8"
|
"unicode/utf8"
|
||||||
@@ -12,6 +11,7 @@ import (
|
|||||||
"goyco/internal/config"
|
"goyco/internal/config"
|
||||||
"goyco/internal/testutils"
|
"goyco/internal/testutils"
|
||||||
|
|
||||||
|
"github.com/urfave/cli/v3"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -36,32 +36,15 @@ func FuzzCLIArgs(f *testing.F) {
|
|||||||
if len(args) == 0 {
|
if len(args) == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
cmd := buildRootCommand(testutils.NewTestConfig())
|
||||||
|
for _, sub := range cmd.Commands {
|
||||||
|
sub.Action = func(context.Context, *cli.Command) error { return nil }
|
||||||
|
}
|
||||||
|
|
||||||
fs := flag.NewFlagSet("goyco", flag.ContinueOnError)
|
err := cmd.Run(context.Background(), append([]string{"goyco"}, args...))
|
||||||
fs.SetOutput(os.Stderr)
|
|
||||||
fs.Usage = printRootUsage
|
|
||||||
showHelp := fs.Bool("help", false, "show this help message")
|
|
||||||
|
|
||||||
err := fs.Parse(args)
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !strings.Contains(err.Error(), "flag") && !strings.Contains(err.Error(), "help") {
|
if !strings.Contains(err.Error(), "flag") && !strings.Contains(err.Error(), "unknown command") {
|
||||||
t.Logf("Unexpected error format from flag parsing: %v", err)
|
t.Logf("Unexpected error format from command parsing: %v", err)
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if *showHelp && err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
remaining := fs.Args()
|
|
||||||
if len(remaining) > 0 {
|
|
||||||
cmdName := remaining[0]
|
|
||||||
if len(cmdName) == 0 {
|
|
||||||
t.Fatal("Command name cannot be empty")
|
|
||||||
}
|
|
||||||
if !isValidUTF8(cmdName) {
|
|
||||||
t.Fatal("Command name must be valid UTF-8")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -96,12 +79,6 @@ func FuzzCommandDispatch(f *testing.F) {
|
|||||||
})
|
})
|
||||||
defer commands.SetDBConnector(nil)
|
defer commands.SetDBConnector(nil)
|
||||||
|
|
||||||
daemonCommands := map[string]bool{
|
|
||||||
"start": true,
|
|
||||||
"stop": true,
|
|
||||||
"status": true,
|
|
||||||
}
|
|
||||||
|
|
||||||
f.Add("run")
|
f.Add("run")
|
||||||
f.Add("help")
|
f.Add("help")
|
||||||
f.Add("user")
|
f.Add("user")
|
||||||
@@ -121,18 +98,20 @@ func FuzzCommandDispatch(f *testing.F) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cmd := buildRootCommand(cfg)
|
||||||
|
for _, sub := range cmd.Commands {
|
||||||
|
sub.Action = func(context.Context, *cli.Command) error { return nil }
|
||||||
|
}
|
||||||
|
|
||||||
cmdName := parts[0]
|
cmdName := parts[0]
|
||||||
args := parts[1:]
|
args := parts[1:]
|
||||||
|
|
||||||
if daemonCommands[cmdName] {
|
err := cmd.Run(context.Background(), append([]string{"goyco"}, append([]string{cmdName}, args...)...))
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
err := dispatchCommand(cfg, cmdName, args)
|
|
||||||
|
|
||||||
knownCommands := map[string]bool{
|
knownCommands := map[string]bool{
|
||||||
"run": true, "user": true, "post": true, "prune": true, "migrate": true,
|
"run": true, "user": true, "post": true, "prune": true, "migrate": true,
|
||||||
"migrations": true, "seed": true, "help": true, "-h": true, "--help": true,
|
"migrations": true, "seed": true, "help": true, "-h": true, "--help": true,
|
||||||
|
"start": true, "stop": true, "status": true,
|
||||||
}
|
}
|
||||||
|
|
||||||
if knownCommands[cmdName] {
|
if knownCommands[cmdName] {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// @title Goyco API
|
// @title Goyco API
|
||||||
// @version 0.1.0
|
// @version 0.1.1
|
||||||
// @description Goyco is a Y Combinator-style news aggregation platform API.
|
// @description Goyco is a Y Combinator-style news aggregation platform API.
|
||||||
// @contact.name Goyco Team
|
// @contact.name Goyco Team
|
||||||
// @contact.email sandro@cazzaniga.fr
|
// @contact.email sandro@cazzaniga.fr
|
||||||
@@ -12,8 +12,8 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"flag"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
@@ -55,7 +55,7 @@ func run(args []string) error {
|
|||||||
|
|
||||||
docs.SwaggerInfo.Title = fmt.Sprintf("%s API", cfg.App.Title)
|
docs.SwaggerInfo.Title = fmt.Sprintf("%s API", cfg.App.Title)
|
||||||
docs.SwaggerInfo.Description = "Y Combinator-style news board API."
|
docs.SwaggerInfo.Description = "Y Combinator-style news board API."
|
||||||
docs.SwaggerInfo.Version = version.Version
|
docs.SwaggerInfo.Version = version.GetVersion()
|
||||||
docs.SwaggerInfo.BasePath = "/api"
|
docs.SwaggerInfo.BasePath = "/api"
|
||||||
docs.SwaggerInfo.Host = fmt.Sprintf("%s:%s", cfg.Server.Host, cfg.Server.Port)
|
docs.SwaggerInfo.Host = fmt.Sprintf("%s:%s", cfg.Server.Host, cfg.Server.Port)
|
||||||
docs.SwaggerInfo.Schemes = []string{"http"}
|
docs.SwaggerInfo.Schemes = []string{"http"}
|
||||||
@@ -63,62 +63,9 @@ func run(args []string) error {
|
|||||||
docs.SwaggerInfo.Schemes = append(docs.SwaggerInfo.Schemes, "https")
|
docs.SwaggerInfo.Schemes = append(docs.SwaggerInfo.Schemes, "https")
|
||||||
}
|
}
|
||||||
|
|
||||||
rootFS := flag.NewFlagSet("goyco", flag.ContinueOnError)
|
root := buildRootCommand(cfg)
|
||||||
rootFS.SetOutput(os.Stderr)
|
runArgs := append([]string{os.Args[0]}, args...)
|
||||||
rootFS.Usage = printRootUsage
|
return root.Run(context.Background(), runArgs)
|
||||||
showHelp := rootFS.Bool("help", false, "show this help message")
|
|
||||||
jsonOutput := rootFS.Bool("json", cfg.CLI.JSONOutputDefault, "output results in JSON format")
|
|
||||||
|
|
||||||
if err := rootFS.Parse(args); err != nil {
|
|
||||||
if errors.Is(err, flag.ErrHelp) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return fmt.Errorf("failed to parse arguments: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if *showHelp {
|
|
||||||
printRootUsage()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
commands.SetJSONOutput(*jsonOutput)
|
|
||||||
|
|
||||||
remaining := rootFS.Args()
|
|
||||||
if len(remaining) == 0 {
|
|
||||||
printRootUsage()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return dispatchCommand(cfg, remaining[0], remaining[1:])
|
|
||||||
}
|
|
||||||
|
|
||||||
func dispatchCommand(cfg *config.Config, name string, args []string) error {
|
|
||||||
switch name {
|
|
||||||
case "run":
|
|
||||||
return handleRunCommand(cfg, args)
|
|
||||||
case "start":
|
|
||||||
return commands.HandleStartCommand(cfg, args)
|
|
||||||
case "stop":
|
|
||||||
return commands.HandleStopCommand(cfg, args)
|
|
||||||
case "status":
|
|
||||||
return commands.HandleStatusCommand(cfg, name, args)
|
|
||||||
case "user":
|
|
||||||
return commands.HandleUserCommand(cfg, name, args)
|
|
||||||
case "post":
|
|
||||||
return commands.HandlePostCommand(cfg, name, args)
|
|
||||||
case "prune":
|
|
||||||
return commands.HandlePruneCommand(cfg, name, args)
|
|
||||||
case "migrate", "migrations":
|
|
||||||
return commands.HandleMigrateCommand(cfg, name, args)
|
|
||||||
case "seed":
|
|
||||||
return commands.HandleSeedCommand(cfg, name, args)
|
|
||||||
case "help", "-h", "--help":
|
|
||||||
printRootUsage()
|
|
||||||
return nil
|
|
||||||
default:
|
|
||||||
printRootUsage()
|
|
||||||
return fmt.Errorf("unknown command: %s", name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleRunCommand(cfg *config.Config, args []string) error {
|
func handleRunCommand(cfg *config.Config, args []string) error {
|
||||||
|
|||||||
@@ -3,14 +3,13 @@ package main
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"errors"
|
|
||||||
"flag"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"goyco/cmd/goyco/commands"
|
||||||
"goyco/internal/config"
|
"goyco/internal/config"
|
||||||
"goyco/internal/database"
|
"goyco/internal/database"
|
||||||
"goyco/internal/handlers"
|
"goyco/internal/handlers"
|
||||||
@@ -76,6 +75,10 @@ func TestServerConfigurationFromConfig(t *testing.T) {
|
|||||||
IdleTimeout: cfg.Server.IdleTimeout,
|
IdleTimeout: cfg.Server.IdleTimeout,
|
||||||
MaxHeaderBytes: cfg.Server.MaxHeaderBytes,
|
MaxHeaderBytes: cfg.Server.MaxHeaderBytes,
|
||||||
}
|
}
|
||||||
|
expectedAddr := cfg.Server.Host + ":" + cfg.Server.Port
|
||||||
|
if srv.Addr != expectedAddr {
|
||||||
|
t.Errorf("Expected server address to be %q, got %q", expectedAddr, srv.Addr)
|
||||||
|
}
|
||||||
|
|
||||||
if srv.ReadTimeout != 30*time.Second {
|
if srv.ReadTimeout != 30*time.Second {
|
||||||
t.Errorf("Expected ReadTimeout to be 30s, got %v", srv.ReadTimeout)
|
t.Errorf("Expected ReadTimeout to be 30s, got %v", srv.ReadTimeout)
|
||||||
@@ -172,6 +175,10 @@ func TestTLSWiringFromConfig(t *testing.T) {
|
|||||||
t.Errorf("Expected server address to be %q, got %q", expectedAddr, srv.Addr)
|
t.Errorf("Expected server address to be %q, got %q", expectedAddr, srv.Addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if srv.ReadHeaderTimeout != 5*time.Second {
|
||||||
|
t.Errorf("Expected ReadHeaderTimeout to be 5s, got %v", srv.ReadHeaderTimeout)
|
||||||
|
}
|
||||||
|
|
||||||
if cfg.Server.EnableTLS {
|
if cfg.Server.EnableTLS {
|
||||||
srv.TLSConfig = &tls.Config{
|
srv.TLSConfig = &tls.Config{
|
||||||
MinVersion: tls.VersionTLS12,
|
MinVersion: tls.VersionTLS12,
|
||||||
@@ -267,36 +274,37 @@ func TestConfigLoadingInCLI(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestFlagParsingInCLI(t *testing.T) {
|
func TestFlagParsingInCLI(t *testing.T) {
|
||||||
originalArgs := os.Args
|
|
||||||
defer func() {
|
|
||||||
os.Args = originalArgs
|
|
||||||
}()
|
|
||||||
|
|
||||||
t.Run("help flag", func(t *testing.T) {
|
t.Run("help flag", func(t *testing.T) {
|
||||||
os.Args = []string{"goyco", "--help"}
|
cmd := buildRootCommand(testutils.NewTestConfig())
|
||||||
fs := flag.NewFlagSet("goyco", flag.ContinueOnError)
|
err := cmd.Run(context.Background(), []string{"goyco", "--help"})
|
||||||
fs.SetOutput(os.Stderr)
|
if err != nil {
|
||||||
showHelp := fs.Bool("help", false, "show help")
|
|
||||||
|
|
||||||
err := fs.Parse([]string{"--help"})
|
|
||||||
if err != nil && !errors.Is(err, flag.ErrHelp) {
|
|
||||||
t.Errorf("Expected help flag parsing, got error: %v", err)
|
t.Errorf("Expected help flag parsing, got error: %v", err)
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
|
||||||
if !*showHelp {
|
t.Run("json flag", func(t *testing.T) {
|
||||||
t.Error("Expected help flag to be true")
|
cmd := buildRootCommand(testutils.NewTestConfig())
|
||||||
|
err := cmd.Run(context.Background(), []string{"goyco", "--json"})
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Expected json flag parsing, got error: %v", err)
|
||||||
}
|
}
|
||||||
|
if !commands.IsJSONOutput() {
|
||||||
|
t.Error("Expected json output to be enabled")
|
||||||
|
}
|
||||||
|
commands.SetJSONOutput(false)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("command dispatch", func(t *testing.T) {
|
t.Run("command dispatch", func(t *testing.T) {
|
||||||
cfg := testutils.NewTestConfig()
|
cfg := testutils.NewTestConfig()
|
||||||
|
|
||||||
err := dispatchCommand(cfg, "unknown", []string{})
|
cmd := buildRootCommand(cfg)
|
||||||
|
err := cmd.Run(context.Background(), []string{"goyco", "unknown"})
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Error("Expected error for unknown command")
|
t.Error("Expected error for unknown command")
|
||||||
}
|
}
|
||||||
|
|
||||||
err = dispatchCommand(cfg, "help", []string{})
|
cmd = buildRootCommand(cfg)
|
||||||
|
err = cmd.Run(context.Background(), []string{"goyco", "help"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Help command should not error: %v", err)
|
t.Errorf("Help command should not error: %v", err)
|
||||||
}
|
}
|
||||||
@@ -364,6 +372,26 @@ func TestServerInitializationFlow(t *testing.T) {
|
|||||||
if srv.Handler == nil {
|
if srv.Handler == nil {
|
||||||
t.Error("Expected server handler to be set")
|
t.Error("Expected server handler to be set")
|
||||||
}
|
}
|
||||||
|
expectedAddr := cfg.Server.Host + ":" + cfg.Server.Port
|
||||||
|
if srv.Addr != expectedAddr {
|
||||||
|
t.Errorf("Expected server address to be %q, got %q", expectedAddr, srv.Addr)
|
||||||
|
}
|
||||||
|
|
||||||
|
if srv.ReadTimeout != cfg.Server.ReadTimeout {
|
||||||
|
t.Errorf("Expected ReadTimeout to be %v, got %v", cfg.Server.ReadTimeout, srv.ReadTimeout)
|
||||||
|
}
|
||||||
|
|
||||||
|
if srv.WriteTimeout != cfg.Server.WriteTimeout {
|
||||||
|
t.Errorf("Expected WriteTimeout to be %v, got %v", cfg.Server.WriteTimeout, srv.WriteTimeout)
|
||||||
|
}
|
||||||
|
|
||||||
|
if srv.IdleTimeout != cfg.Server.IdleTimeout {
|
||||||
|
t.Errorf("Expected IdleTimeout to be %v, got %v", cfg.Server.IdleTimeout, srv.IdleTimeout)
|
||||||
|
}
|
||||||
|
|
||||||
|
if srv.MaxHeaderBytes != cfg.Server.MaxHeaderBytes {
|
||||||
|
t.Errorf("Expected MaxHeaderBytes to be %d, got %d", cfg.Server.MaxHeaderBytes, srv.MaxHeaderBytes)
|
||||||
|
}
|
||||||
|
|
||||||
testServer := httptest.NewServer(srv.Handler)
|
testServer := httptest.NewServer(srv.Handler)
|
||||||
defer testServer.Close()
|
defer testServer.Close()
|
||||||
|
|||||||
@@ -2129,7 +2129,7 @@ const docTemplate = `{
|
|||||||
|
|
||||||
// SwaggerInfo holds exported Swagger Info so clients can modify it
|
// SwaggerInfo holds exported Swagger Info so clients can modify it
|
||||||
var SwaggerInfo = &swag.Spec{
|
var SwaggerInfo = &swag.Spec{
|
||||||
Version: "0.1.0",
|
Version: "0.1.1",
|
||||||
Host: "localhost:8080",
|
Host: "localhost:8080",
|
||||||
BasePath: "/api",
|
BasePath: "/api",
|
||||||
Schemes: []string{"http"},
|
Schemes: []string{"http"},
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
"name": "GPLv3",
|
"name": "GPLv3",
|
||||||
"url": "https://www.gnu.org/licenses/gpl-3.0.html"
|
"url": "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||||
},
|
},
|
||||||
"version": "0.1.0"
|
"version": "0.1.1"
|
||||||
},
|
},
|
||||||
"host": "localhost:8080",
|
"host": "localhost:8080",
|
||||||
"basePath": "/api",
|
"basePath": "/api",
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ info:
|
|||||||
name: GPLv3
|
name: GPLv3
|
||||||
url: https://www.gnu.org/licenses/gpl-3.0.html
|
url: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
title: Goyco API
|
title: Goyco API
|
||||||
version: 0.1.0
|
version: 0.1.1
|
||||||
paths:
|
paths:
|
||||||
/api:
|
/api:
|
||||||
get:
|
get:
|
||||||
|
|||||||
1
go.mod
1
go.mod
@@ -12,6 +12,7 @@ require (
|
|||||||
github.com/stretchr/testify v1.11.1
|
github.com/stretchr/testify v1.11.1
|
||||||
github.com/swaggo/http-swagger v1.3.4
|
github.com/swaggo/http-swagger v1.3.4
|
||||||
github.com/swaggo/swag v1.16.6
|
github.com/swaggo/swag v1.16.6
|
||||||
|
github.com/urfave/cli/v3 v3.6.1
|
||||||
golang.org/x/crypto v0.43.0
|
golang.org/x/crypto v0.43.0
|
||||||
golang.org/x/net v0.46.0
|
golang.org/x/net v0.46.0
|
||||||
gorm.io/driver/postgres v1.6.0
|
gorm.io/driver/postgres v1.6.0
|
||||||
|
|||||||
2
go.sum
2
go.sum
@@ -116,3 +116,5 @@ gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
|
|||||||
gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
|
gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
|
||||||
gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
|
gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
|
||||||
gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
|
gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
|
||||||
|
github.com/urfave/cli/v3 v3.6.1 h1:j8Qq8NyUawj/7rTYdBGrxcH7A/j7/G8Q5LhWEW4G3Mo=
|
||||||
|
github.com/urfave/cli/v3 v3.6.1/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ func (h *APIHandler) GetAPIInfo(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
apiInfo := map[string]any{
|
apiInfo := map[string]any{
|
||||||
"name": fmt.Sprintf("%s API", h.config.App.Title),
|
"name": fmt.Sprintf("%s API", h.config.App.Title),
|
||||||
"version": version.Version,
|
"version": version.GetVersion(),
|
||||||
"description": "Y Combinator-style news board API",
|
"description": "Y Combinator-style news board API",
|
||||||
"endpoints": map[string]any{
|
"endpoints": map[string]any{
|
||||||
"authentication": map[string]any{
|
"authentication": map[string]any{
|
||||||
@@ -145,7 +145,7 @@ func (h *APIHandler) GetHealth(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
if h.healthChecker != nil {
|
if h.healthChecker != nil {
|
||||||
health := h.healthChecker.CheckHealth()
|
health := h.healthChecker.CheckHealth()
|
||||||
health["version"] = version.Version
|
health["version"] = version.GetVersion()
|
||||||
SendSuccessResponse(w, "Health check successful", health)
|
SendSuccessResponse(w, "Health check successful", health)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -155,7 +155,7 @@ func (h *APIHandler) GetHealth(w http.ResponseWriter, r *http.Request) {
|
|||||||
health := map[string]any{
|
health := map[string]any{
|
||||||
"status": "healthy",
|
"status": "healthy",
|
||||||
"timestamp": currentTimestamp,
|
"timestamp": currentTimestamp,
|
||||||
"version": version.Version,
|
"version": version.GetVersion(),
|
||||||
"services": map[string]any{
|
"services": map[string]any{
|
||||||
"database": "connected",
|
"database": "connected",
|
||||||
"api": "running",
|
"api": "running",
|
||||||
@@ -230,7 +230,7 @@ func (h *APIHandler) GetMetrics(w http.ResponseWriter, r *http.Request) {
|
|||||||
},
|
},
|
||||||
"system": map[string]any{
|
"system": map[string]any{
|
||||||
"timestamp": time.Now().UTC().Format(time.RFC3339),
|
"timestamp": time.Now().UTC().Format(time.RFC3339),
|
||||||
"version": version.Version,
|
"version": version.GetVersion(),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,25 +35,25 @@ func FuzzJSONParsing(f *testing.F) {
|
|||||||
func FuzzURLParsing(f *testing.F) {
|
func FuzzURLParsing(f *testing.F) {
|
||||||
helper := fuzz.NewFuzzTestHelper()
|
helper := fuzz.NewFuzzTestHelper()
|
||||||
helper.RunBasicFuzzTest(f, func(t *testing.T, input string) {
|
helper.RunBasicFuzzTest(f, func(t *testing.T, input string) {
|
||||||
|
var sanitized strings.Builder
|
||||||
sanitized := ""
|
sanitized.Grow(len(input))
|
||||||
|
sanitizedLen := 0
|
||||||
for _, char := range input {
|
for _, char := range input {
|
||||||
|
|
||||||
if (char >= 'a' && char <= 'z') || (char >= 'A' && char <= 'Z') ||
|
if (char >= 'a' && char <= 'z') || (char >= 'A' && char <= 'Z') ||
|
||||||
(char >= '0' && char <= '9') || char == '-' || char == '_' {
|
(char >= '0' && char <= '9') || char == '-' || char == '_' {
|
||||||
sanitized += string(char)
|
sanitized.WriteRune(char)
|
||||||
|
sanitizedLen++
|
||||||
|
if sanitizedLen >= 20 {
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(sanitized) > 20 {
|
if sanitizedLen == 0 {
|
||||||
sanitized = sanitized[:20]
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(sanitized) == 0 {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
url := "/api/posts/" + sanitized
|
url := "/api/posts/" + sanitized.String()
|
||||||
req := httptest.NewRequest("GET", url, nil)
|
req := httptest.NewRequest("GET", url, nil)
|
||||||
|
|
||||||
pathParts := strings.Split(req.URL.Path, "/")
|
pathParts := strings.Split(req.URL.Path, "/")
|
||||||
@@ -67,46 +67,52 @@ func FuzzURLParsing(f *testing.F) {
|
|||||||
func FuzzQueryParameters(f *testing.F) {
|
func FuzzQueryParameters(f *testing.F) {
|
||||||
helper := fuzz.NewFuzzTestHelper()
|
helper := fuzz.NewFuzzTestHelper()
|
||||||
helper.RunBasicFuzzTest(f, func(t *testing.T, input string) {
|
helper.RunBasicFuzzTest(f, func(t *testing.T, input string) {
|
||||||
|
|
||||||
if !utf8.ValidString(input) {
|
if !utf8.ValidString(input) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
sanitized := ""
|
var sanitized strings.Builder
|
||||||
|
sanitized.Grow(len(input))
|
||||||
|
sanitizedLen := 0
|
||||||
for _, char := range input {
|
for _, char := range input {
|
||||||
|
|
||||||
if char >= 32 && char <= 126 {
|
if char >= 32 && char <= 126 {
|
||||||
switch char {
|
switch char {
|
||||||
case ' ', '\n', '\r', '\t':
|
case ' ', '\n', '\r', '\t':
|
||||||
|
|
||||||
continue
|
continue
|
||||||
case '&':
|
case '&':
|
||||||
sanitized += "%26"
|
sanitized.WriteString("%26")
|
||||||
|
sanitizedLen += 3
|
||||||
case '=':
|
case '=':
|
||||||
sanitized += "%3D"
|
sanitized.WriteString("%3D")
|
||||||
|
sanitizedLen += 3
|
||||||
case '?':
|
case '?':
|
||||||
sanitized += "%3F"
|
sanitized.WriteString("%3F")
|
||||||
|
sanitizedLen += 3
|
||||||
case '#':
|
case '#':
|
||||||
sanitized += "%23"
|
sanitized.WriteString("%23")
|
||||||
|
sanitizedLen += 3
|
||||||
case '/':
|
case '/':
|
||||||
sanitized += "%2F"
|
sanitized.WriteString("%2F")
|
||||||
|
sanitizedLen += 3
|
||||||
case '\\':
|
case '\\':
|
||||||
sanitized += "%5C"
|
sanitized.WriteString("%5C")
|
||||||
|
sanitizedLen += 3
|
||||||
default:
|
default:
|
||||||
sanitized += string(char)
|
sanitized.WriteRune(char)
|
||||||
|
sanitizedLen++
|
||||||
|
}
|
||||||
|
if sanitizedLen >= 100 {
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(sanitized) > 100 {
|
if sanitizedLen == 0 {
|
||||||
sanitized = sanitized[:100]
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(sanitized) == 0 {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
query := "?q=" + sanitized + "&limit=10&offset=0"
|
query := "?q=" + sanitized.String() + "&limit=10&offset=0"
|
||||||
req := httptest.NewRequest("GET", "/api/posts/search"+query, nil)
|
req := httptest.NewRequest("GET", "/api/posts/search"+query, nil)
|
||||||
|
|
||||||
q := req.URL.Query().Get("q")
|
q := req.URL.Query().Get("q")
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
package version
|
package version
|
||||||
|
|
||||||
const Version = "0.1.0"
|
const version = "0.1.1"
|
||||||
|
|
||||||
|
func GetVersion() string {
|
||||||
|
return version
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,39 +8,39 @@ import (
|
|||||||
func TestVersionSemver(t *testing.T) {
|
func TestVersionSemver(t *testing.T) {
|
||||||
semverRegex := regexp.MustCompile(`^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`)
|
semverRegex := regexp.MustCompile(`^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`)
|
||||||
|
|
||||||
if !semverRegex.MatchString(Version) {
|
if !semverRegex.MatchString(GetVersion()) {
|
||||||
t.Errorf("Version %q does not follow semantic versioning format (MAJOR.MINOR.PATCH[-PRERELEASE][+BUILD])", Version)
|
t.Errorf("Version %q does not follow semantic versioning format (MAJOR.MINOR.PATCH[-PRERELEASE][+BUILD])", GetVersion())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestVersionSemverFlexible(t *testing.T) {
|
func TestVersionSemverFlexible(t *testing.T) {
|
||||||
flexibleSemverRegex := regexp.MustCompile(`^(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*))?(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`)
|
flexibleSemverRegex := regexp.MustCompile(`^(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*))?(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`)
|
||||||
|
|
||||||
if !flexibleSemverRegex.MatchString(Version) {
|
if !flexibleSemverRegex.MatchString(GetVersion()) {
|
||||||
t.Errorf("Version %q does not follow semantic versioning format (MAJOR.MINOR[.PATCH][-PRERELEASE][+BUILD])", Version)
|
t.Errorf("Version %q does not follow semantic versioning format (MAJOR.MINOR[.PATCH][-PRERELEASE][+BUILD])", GetVersion())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestVersionNotEmpty(t *testing.T) {
|
func TestVersionNotEmpty(t *testing.T) {
|
||||||
if Version == "" {
|
if GetVersion() == "" {
|
||||||
t.Error("Version should not be empty")
|
t.Error("Version should not be empty")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestVersionFormat(t *testing.T) {
|
func TestVersionFormat(t *testing.T) {
|
||||||
if !regexp.MustCompile(`\d+\.\d+`).MatchString(Version) {
|
if !regexp.MustCompile(`\d+\.\d+`).MatchString(GetVersion()) {
|
||||||
t.Errorf("Version %q should contain at least MAJOR.MINOR format", Version)
|
t.Errorf("Version %q should contain at least MAJOR.MINOR format", GetVersion())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestVersionStartsWithNumber(t *testing.T) {
|
func TestVersionStartsWithNumber(t *testing.T) {
|
||||||
if !regexp.MustCompile(`^\d+`).MatchString(Version) {
|
if !regexp.MustCompile(`^\d+`).MatchString(GetVersion()) {
|
||||||
t.Errorf("Version %q should start with a number", Version)
|
t.Errorf("Version %q should start with a number", GetVersion())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestVersionNoLeadingZeros(t *testing.T) {
|
func TestVersionNoLeadingZeros(t *testing.T) {
|
||||||
parts := regexp.MustCompile(`^(\d+)\.(\d+)`).FindStringSubmatch(Version)
|
parts := regexp.MustCompile(`^(\d+)\.(\d+)`).FindStringSubmatch(GetVersion())
|
||||||
if len(parts) >= 3 {
|
if len(parts) >= 3 {
|
||||||
major := parts[1]
|
major := parts[1]
|
||||||
minor := parts[2]
|
minor := parts[2]
|
||||||
|
|||||||
Reference in New Issue
Block a user