fixed NPE for fetching an optional field in GetQueueUrlInput

argoproj · Nov 27, 2024 · 912ef48 · 912ef48
1 parent 2d57c71
commit 912ef48
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/services/awssqs.go b/pkg/services/awssqs.go
@@ -192,11 +192,17 @@ type SQSSendMessageAPI interface {
 }
 
 var GetQueueURL = func(c context.Context, api SQSSendMessageAPI, input *sqs.GetQueueUrlInput) (*sqs.GetQueueUrlOutput, error) {
-	log.Infof("[GetQueueUrl] queue_name: %s, account_id: %s", *input.QueueName, *input.QueueOwnerAWSAccountId)
+	// QueueName is required, QueueOwnerAWSAccountId is optional
+	accountIdStr := ""
+	if input.QueueOwnerAWSAccountId != nil {
+		accountIdStr = ", account_id: " + *input.QueueOwnerAWSAccountId
+	}
+	log.Infof("[GetQueueUrl] queue_name: %s%s", *input.QueueName, accountIdStr)	
 	return api.GetQueueUrl(c, input)
 }
 
 var SendMsg = func(c context.Context, api SQSSendMessageAPI, input *sqs.SendMessageInput) (*sqs.SendMessageOutput, error) {
+	// QueueUrl & MessageBody are required fields.
 	log.Infof("[SendMsg] queue_url: %s, message_body: %s", *input.QueueUrl, *input.MessageBody)
 	return api.SendMessage(c, input)
 }