Skip to content

Commit 07a48de

Browse files
authored
Merge pull request #16 from pepabo/refactor/version-management
refactor: move version management to bot package
2 parents a2df78c + fad4a9b commit 07a48de

7 files changed

Lines changed: 14 additions & 16 deletions

File tree

.tagpr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@
4545
[tagpr]
4646
vPrefix = true
4747
releaseBranch = main
48-
versionFile = version.go
48+
versionFile = bot/version.go

bot/bot.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ type Bot struct {
3030
verbose bool
3131
logger *slog.Logger
3232
repo repository.UserPointsRepository
33-
version string
3433
}
3534

3635
// New creates a new Slack bot instance
37-
func New(botToken, appToken string, repo repository.UserPointsRepository, verbose bool, logger *slog.Logger, version string) (*Bot, error) {
36+
func New(botToken, appToken string, repo repository.UserPointsRepository, verbose bool, logger *slog.Logger) (*Bot, error) {
3837
if botToken == "" || appToken == "" {
3938
return nil, fmt.Errorf("SLACK_BOT_TOKEN or SLACK_APP_TOKEN is not set")
4039
}
@@ -60,13 +59,12 @@ func New(botToken, appToken string, repo repository.UserPointsRepository, verbos
6059
verbose: verbose,
6160
logger: logger,
6261
repo: repo,
63-
version: version,
6462
}, nil
6563
}
6664

6765
// Start starts the Slack bot
6866
func (b *Bot) Start() {
69-
b.logger.Debug("Starting bot(version: " + b.version + ")...")
67+
b.logger.Debug("Starting bot(version: " + Version + ")...")
7068
go b.handleEvents()
7169
b.logger.Debug("Starting socket mode client...")
7270
if err := b.socketClient.Run(); err != nil {

bot/bot_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func setupTestBot(t *testing.T) (*Bot, func()) {
3333
}
3434

3535
// Create a test bot with dummy tokens
36-
bot, err := New("dummy-bot-token", "dummy-app-token", repo, false, logger, "dummy-version")
36+
bot, err := New("dummy-bot-token", "dummy-app-token", repo, false, logger)
3737
if err != nil {
3838
if err := os.Remove(tempFile.Name()); err != nil {
3939
t.Logf("Failed to remove temp file: %v", err)
@@ -103,7 +103,7 @@ func TestNew(t *testing.T) {
103103

104104
for _, tt := range tests {
105105
t.Run(tt.name, func(t *testing.T) {
106-
bot, err := New(tt.botToken, tt.appToken, repo, tt.verbose, logger, "dummy-version")
106+
bot, err := New(tt.botToken, tt.appToken, repo, tt.verbose, logger)
107107
if (err != nil) != tt.wantErr {
108108
t.Errorf("New() error = %v, wantErr %v", err, tt.wantErr)
109109
}

bot/version.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package bot
2+
3+
var Version = "1.1.2"

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ module plusplusbot
33
go 1.24
44

55
require (
6+
github.com/aws/aws-sdk-go-v2 v1.36.3
7+
github.com/aws/aws-sdk-go-v2/config v1.29.14
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
9+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.43.1
10+
github.com/guregu/dynamo/v2 v2.3.0
611
github.com/ncruces/go-sqlite3 v0.25.2
712
github.com/slack-go/slack v0.16.0
813
)
914

1015
require (
11-
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
12-
github.com/aws/aws-sdk-go-v2/config v1.29.14 // indirect
13-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
1416
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.14.11 // indirect
1517
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
1618
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
1719
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
1820
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
19-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.43.1 // indirect
2021
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.4 // indirect
2122
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
2223
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.15 // indirect
@@ -27,7 +28,6 @@ require (
2728
github.com/aws/smithy-go v1.22.2 // indirect
2829
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2930
github.com/gorilla/websocket v1.4.2 // indirect
30-
github.com/guregu/dynamo/v2 v2.3.0 // indirect
3131
github.com/ncruces/julianday v1.0.0 // indirect
3232
github.com/stretchr/testify v1.8.4 // indirect
3333
github.com/tetratelabs/wazero v1.9.0 // indirect

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func main() {
4141

4242
// Initialize bot
4343
verbose := os.Getenv("DEBUG") != ""
44-
bot, err := bot.New(botToken, appToken, repo, verbose, logger, version)
44+
bot, err := bot.New(botToken, appToken, repo, verbose, logger)
4545
if err != nil {
4646
logger.Error("Failed to create bot", "error", err)
4747
os.Exit(1)

version.go

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)