MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-10-30 00:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: use amqp.ParseURL to parse amqp url (#21528)

Browse Source
This commit is contained in:
jiuker 2025-08-21 12:25:07 +08:00 committed by GitHub
parent 5a35585acd
commit 86d9d9b55e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/config/notify/parse.go
View File

@ -34,6 +34,7 @@ import (
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
"github.com/minio/pkg/v3/env" "github.com/minio/pkg/v3/env"
xnet "github.com/minio/pkg/v3/net" xnet "github.com/minio/pkg/v3/net"
"github.com/rabbitmq/amqp091-go"
) )
const ( const (
@ -1705,7 +1706,7 @@ func GetNotifyAMQP(amqpKVS map[string]config.KVS) (map[string]target.AMQPArgs, e
if k != config.Default { if k != config.Default {
urlEnv = urlEnv + config.Default + k urlEnv = urlEnv + config.Default + k
} }
url, err := xnet.ParseURL(env.Get(urlEnv, kv.Get(target.AmqpURL))) url, err := amqp091.ParseURI(env.Get(urlEnv, kv.Get(target.AmqpURL)))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1771,7 +1772,7 @@ func GetNotifyAMQP(amqpKVS map[string]config.KVS) (map[string]target.AMQPArgs, e
} }
amqpArgs := target.AMQPArgs{ amqpArgs := target.AMQPArgs{
Enable: enabled, Enable: enabled,
URL: *url, URL: url,
Exchange: env.Get(exchangeEnv, kv.Get(target.AmqpExchange)), Exchange: env.Get(exchangeEnv, kv.Get(target.AmqpExchange)),
RoutingKey: env.Get(routingKeyEnv, kv.Get(target.AmqpRoutingKey)), RoutingKey: env.Get(routingKeyEnv, kv.Get(target.AmqpRoutingKey)),
ExchangeType: env.Get(exchangeTypeEnv, kv.Get(target.AmqpExchangeType)), ExchangeType: env.Get(exchangeTypeEnv, kv.Get(target.AmqpExchangeType)),

2
internal/event/target/amqp.go
View File

@ -39,7 +39,7 @@ import (
// AMQPArgs - AMQP target arguments. // AMQPArgs - AMQP target arguments.
type AMQPArgs struct { type AMQPArgs struct {
Enable bool `json:"enable"` Enable bool `json:"enable"`
URL xnet.URL `json:"url"` URL amqp091.URI `json:"url"`
Exchange string `json:"exchange"` Exchange string `json:"exchange"`
RoutingKey string `json:"routingKey"` RoutingKey string `json:"routingKey"`
ExchangeType string `json:"exchangeType"` ExchangeType string `json:"exchangeType"`