From d72aeca382ddf5da55f08070cd0d32c90a5b7fc2 Mon Sep 17 00:00:00 2001 From: Dusan Malusev Date: Tue, 23 Apr 2024 20:19:21 +0200 Subject: [PATCH] Provide Consumer IMPL Signed-off-by: Dusan Malusev --- .golangci.yml | 27 +++++++------ amqpfx/amqpfx.go | 1 - amqpfx/consumer.go | 97 ++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 + go.sum | 27 +++++-------- 5 files changed, 123 insertions(+), 31 deletions(-) delete mode 100644 amqpfx/amqpfx.go create mode 100644 amqpfx/consumer.go diff --git a/.golangci.yml b/.golangci.yml index ffdee67..2e0e877 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,19 +3,23 @@ run: timeout: 5m issues-exit-code: 1 tests: true + go: '1.22' + modules-download-mode: mod + allow-parallel-runners: true -skip-dirs: - - docs/ - -skip-files: - - "*_gen\\.go$" - -modules-download-mode: mod -allow-parallel-runners: true -go: '1.22' +issues: + exclude-rules: + - path: _test\.go + linters: + - gocyclo + - errcheck + - dupl + - gosec + exclude-files: + - .*_gen\.go$ + - .*setup\.go$ output: - format: colored-line-number print-issued-lines: true print-linter-name: true uniq-by-line: true @@ -39,7 +43,6 @@ linters: - gofumpt - ginkgolinter - gocheckcompilerdirectives - - gochecknoglobals - gocognit - goconst - gocritic @@ -94,4 +97,4 @@ linters: - whitespace - zerologlint - prealloc - - perfsprint + - perfsprint \ No newline at end of file diff --git a/amqpfx/amqpfx.go b/amqpfx/amqpfx.go deleted file mode 100644 index ca2c88e..0000000 --- a/amqpfx/amqpfx.go +++ /dev/null @@ -1 +0,0 @@ -package amqpfx \ No newline at end of file diff --git a/amqpfx/consumer.go b/amqpfx/consumer.go new file mode 100644 index 0000000..a1d4a51 --- /dev/null +++ b/amqpfx/consumer.go @@ -0,0 +1,97 @@ +package amqpfx + +import ( + "context" + "fmt" + + "github.com/rabbitmq/amqp091-go" + "go.uber.org/fx" + + "github.com/nano-interactive/go-amqp/v3/connection" + "github.com/nano-interactive/go-amqp/v3/consumer" +) + +func ConsumerModuleFunc[T consumer.Message]( + handler func(context.Context, T) error, + queueOptions consumer.QueueDeclare, + connectionOptions connection.Config, + options ...consumer.Option[T], +) fx.Option { + create := func(opts ...consumer.Option[T]) (consumer.Consumer[T], error) { + return consumer.NewFunc(handler, connectionOptions, queueOptions, opts...) + } + + return c(queueOptions, connectionOptions, create, options...) +} + +func ConsumerModuleRaw[T consumer.Message]( + handler consumer.RawHandler, + queueOptions consumer.QueueDeclare, + connectionOptions connection.Config, + options ...consumer.Option[T], +) fx.Option { + create := func(opts ...consumer.Option[T]) (consumer.Consumer[T], error) { + return consumer.NewRaw(handler, connectionOptions, queueOptions, opts...) + } + + return c(queueOptions, connectionOptions, create, options...) +} + +func ConsumerModuleRawFunc[T consumer.Message]( + handler func(context.Context, *amqp091.Delivery) error, + queueOptions consumer.QueueDeclare, + connectionOptions connection.Config, + options ...consumer.Option[T], +) fx.Option { + create := func(opts ...consumer.Option[T]) (consumer.Consumer[T], error) { + return consumer.NewRawFunc(handler, connectionOptions, queueOptions, opts...) + } + + return c(queueOptions, connectionOptions, create, options...) +} + +func ConsumerModule[T consumer.Message]( + handler consumer.Handler[T], + queueOptions consumer.QueueDeclare, + connectionOptions connection.Config, + options ...consumer.Option[T], +) fx.Option { + create := func(opts ...consumer.Option[T]) (consumer.Consumer[T], error) { + return consumer.New(handler, connectionOptions, queueOptions, opts...) + } + + return c(queueOptions, connectionOptions, create, options...) +} + +func c[T consumer.Message]( + queueOptions consumer.QueueDeclare, + connectionOptions connection.Config, + createConsumer func(...consumer.Option[T]) (consumer.Consumer[T], error), + options ...consumer.Option[T], +) fx.Option { + module := fmt.Sprintf("amqp-consumer-module-%s-%s", queueOptions.QueueName, connectionOptions.ConnectionName) + name := fmt.Sprintf("amqp-consumer-%s-%s", queueOptions.QueueName, connectionOptions.ConnectionName) + + return fx.Module( + module, + fx.Provide(fx.Annotate(func() (consumer.Consumer[T], error) { + opts := make([]consumer.Option[T], 0, len(options)+1) + opts = append(opts, options...) + + c, err := createConsumer(opts...) + if err != nil { + return consumer.Consumer[T]{}, err + } + + return c, nil + }, fx.ResultTags(`name:"`+name+`"`))), + fx.Invoke(fx.Annotate(func(lc fx.Lifecycle, c consumer.Consumer[T]) { + lc.Append(fx.StartStopHook( + c.Start, + c.CloseWithContext, + )) + }, + fx.ParamTags(`name:"`+name+`"`)), + ), + ) +} diff --git a/go.mod b/go.mod index 82cf5f0..2c88a1a 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,9 @@ require ( github.com/golang-migrate/migrate/v4 v4.17.1 github.com/invopop/validation v0.3.0 github.com/jackc/pgx/v5 v5.5.5 + github.com/nano-interactive/go-amqp/v3 v3.1.0 github.com/nano-interactive/go-utils/v2 v2.0.12 + github.com/rabbitmq/amqp091-go v1.9.0 github.com/rs/zerolog v1.32.0 github.com/samber/lo v1.39.0 github.com/spf13/viper v1.18.2 diff --git a/go.sum b/go.sum index dd0ea92..eda5444 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,6 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofiber/fiber/v2 v2.52.4 h1:P+T+4iK7VaqUsq2PALYEfBBo6bJZ4q3FP8cZ84EggTM= github.com/gofiber/fiber/v2 v2.52.4/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= -github.com/golang-migrate/migrate/v4 v4.17.0 h1:rd40H3QXU0AA4IoLllFcEAEo9dYKRHYND2gB4p7xcaU= -github.com/golang-migrate/migrate/v4 v4.17.0/go.mod h1:+Cp2mtLP4/aXDTKb9wmXYitdrNx2HGs45rbWAo6OsKM= github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4= github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= @@ -41,12 +39,13 @@ github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw= github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= @@ -63,12 +62,10 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/nano-interactive/go-utils/v2 v2.0.11 h1:k2eXeyFre+1HbcjsA7anMhatSjsdP9guF0vxy8Wttcs= -github.com/nano-interactive/go-utils/v2 v2.0.11/go.mod h1:++tsLNqi3Cbn0za6BGJuKfhVXtB8AmChrxZ1ksvSUi0= +github.com/nano-interactive/go-amqp/v3 v3.1.0 h1:kMIhAenH3GeQaJJZebGk+3mq2BsvFeGbshPQX7vpFTI= +github.com/nano-interactive/go-amqp/v3 v3.1.0/go.mod h1:WzjCL9Sgj6GsU4Hkbfylusa1L9/1U9tmNonJ4bYN5Z8= github.com/nano-interactive/go-utils/v2 v2.0.12 h1:+useoofopUprRMQVWiid2iHMyzfJ4xqFL0xzJwllQCg= github.com/nano-interactive/go-utils/v2 v2.0.12/go.mod h1:++tsLNqi3Cbn0za6BGJuKfhVXtB8AmChrxZ1ksvSUi0= -github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo= -github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -76,6 +73,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo= +github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= @@ -121,8 +120,6 @@ github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7g github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= -go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc= go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -131,34 +128,28 @@ go.uber.org/dig v1.17.1 h1:Tga8Lz8PcYNsWsyHMZ1Vm0OQOUaJNDyvPImgbAu9YSc= go.uber.org/dig v1.17.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= go.uber.org/fx v1.21.0 h1:qqD6k7PyFHONffW5speYx403ywanuASqU4Rqdpc22XY= go.uber.org/fx v1.21.0/go.mod h1:HT2M7d7RHo+ebKGh9NRcrsrHHfpZ60nW3QRubMRfv48= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= -golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=