From 22896f8859f41a99449d40b78a0d4e8738031081 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 18 Jul 2024 21:35:01 +0200 Subject: [PATCH] internal/config/builder_test.go: rewrite ConfigWithFlags to WithDefaultConfig as we already have a test for flags --- internal/config/builder_test.go | 73 +++++++-------------------------- 1 file changed, 15 insertions(+), 58 deletions(-) diff --git a/internal/config/builder_test.go b/internal/config/builder_test.go index df24552..1de8eb8 100644 --- a/internal/config/builder_test.go +++ b/internal/config/builder_test.go @@ -87,74 +87,31 @@ redis: require.Equal(t, &expected, cfg) } -func TestBuilder_ConfigWithFlags(t *testing.T) { +func TestBuilder_WithDefaultConfig(t *testing.T) { expected := Config{ - Name: "ship-reader-1", - Api: "https://api.example.com", - MessageCodec: "msgpack", + MessageCodec: "json", Log: log.Config{ - Filename: "mylog.log", - Directory: "/var/log", - MaxFileSize: 200, - MaxTime: 30 * time.Minute, + MaxFileSize: 10 * 1000 * 1000, + MaxTime: time.Hour * 24, FileTimestampFormat: "2006-01-02_150405", }, - Ship: ShipConfig{ - Url: "127.0.0.1:8089", - StartBlockNum: 23671836, - EndBlockNum: 23872222, - IrreversibleOnly: true, - MaxMessagesInFlight: 1337, }, - Telegram: TelegramConfig{ - Id: "110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsaw", - Channel: -123456789, + Ship: ShipConfig{ + Url: "ws://127.0.0.1:8080", + StartBlockNum: shipclient.NULL_BLOCK_NUMBER, + EndBlockNum: shipclient.NULL_BLOCK_NUMBER, + MaxMessagesInFlight: 10, }, Redis: RedisConfig{ - Addr: "localhost:6379", - User: "userfromcli", - Password: "passwd", - DB: 4, - Prefix: "some::ship", + Addr: "127.0.0.1:6379", + Prefix: "ship", }, } - builder := NewBuilder() - builder.SetSource(bytes.NewBuffer([]byte(` -name: "ship-reader-1" -api: "http://127.0.0.1:8080" -message_codec: "mojibake" -log: - filename: mylog.log - directory: /var/log - maxtime: 30m - maxfilesize: 200b -ship: - url: "127.0.0.1:8089" - irreversible_only: true - max_messages_in_flight: 1337 - start_block_num: 23671836 - end_block_num: 23872222 -telegram: - id: "110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsaw" - channel: -123456789 -redis: - addr: "localhost:6379" - user: "myuser" - password: "passwd" - db: 4 - prefix: "some::ship" -`))) - - flags := GetFlags() - - require.NoError(t, flags.Set("url", "https://api.example.com")) - require.NoError(t, flags.Set("codec", "msgpack")) - require.NoError(t, flags.Set("redis-user", "userfromcli")) - - builder.SetFlags(flags) - - cfg, err := builder.Build() + cfg, err := NewBuilder(). + SetSource(bytes.NewReader([]byte(``))). + SetFlags(GetFlags()). + Build() require.NoError(t, err) require.Equal(t, &expected, cfg)