MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-28 21:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add tests for bucket-notification-utils (#2723)

Browse Source 
Part fix - 1 for #2711
This commit is contained in:
Harshavardhana
2016-09-16 17:26:27 -07:00
committed by GitHub
parent 797d749322
commit 490056eee3
3 changed files with 163 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/bucket-notification-utils.go
View File

@@ -164,14 +164,13 @@ func isValidTopic(topicARN arnTopic) bool {
func isValidQueueID(queueARN string) bool {
// Unmarshals QueueARN into structured object.
sqsARN := unmarshalSqsARN(queueARN)
// AMQP queue.
if isAMQPQueue(sqsARN) {
// Is Queue identifier valid?.
if isAMQPQueue(sqsARN) { // AMQP eueue.
amqpN := serverConfig.GetAMQPNotifyByID(sqsARN.AccountID)
return amqpN.Enable && amqpN.URL != ""
} else if isElasticQueue(sqsARN) { // Elastic queue.
elasticN := serverConfig.GetElasticSearchNotifyByID(sqsARN.AccountID)
return elasticN.Enable && elasticN.URL != ""
} else if isRedisQueue(sqsARN) { // Redis queue.
redisN := serverConfig.GetRedisNotifyByID(sqsARN.AccountID)
return redisN.Enable && redisN.Addr != ""
@@ -186,13 +185,6 @@ func checkQueueConfig(qConfig queueConfig) APIErrorCode {
return s3Error
}
// Unmarshals QueueARN into structured object.
sqsARN := unmarshalSqsARN(qConfig.QueueARN)
// Validate if sqsARN requested any of the known supported queues.
if !isValidQueue(sqsARN) {
return ErrARNNotification
}
// Validate if the account ID is correct.
if !isValidQueueID(qConfig.QueueARN) {
return ErrARNNotification