fix: JSON protocol for Batch ops + CMV test (61/61 PASS)
- SendMessageBatch/DeleteMessageBatch: JSON tags Successful/Failed for AWS CLI v2 - Fix CMV test: capture receipt handle from same receive that checks visibility
This commit is contained in:
@@ -255,8 +255,8 @@ type SendMessageBatchResponse struct {
|
||||
}
|
||||
|
||||
type SendMessageBatchResult struct {
|
||||
Entry []SendMessageBatchResultEntry `json:"SendMessageBatchResultEntry" xml:"SendMessageBatchResultEntry"`
|
||||
Error []BatchResultErrorEntry `json:"BatchResultErrorEntry,omitempty" xml:"BatchResultErrorEntry,omitempty"`
|
||||
Entry []SendMessageBatchResultEntry `json:"Successful" xml:"SendMessageBatchResultEntry"`
|
||||
Error []BatchResultErrorEntry `json:"Failed,omitempty" xml:"BatchResultErrorEntry,omitempty"`
|
||||
}
|
||||
|
||||
func (r SendMessageBatchResponse) GetResult() interface{} {
|
||||
@@ -321,8 +321,8 @@ Id string `json:"Id" xml:"Id"`
|
||||
}
|
||||
|
||||
type DeleteMessageBatchResult struct {
|
||||
Successful []DeleteMessageBatchResultEntry `json:"DeleteMessageBatchResultEntry" xml:"DeleteMessageBatchResultEntry"`
|
||||
Failed []BatchResultErrorEntry `json:"BatchResultErrorEntry,omitempty" xml:"BatchResultErrorEntry,omitempty"`
|
||||
Successful []DeleteMessageBatchResultEntry `json:"Successful" xml:"DeleteMessageBatchResultEntry"`
|
||||
Failed []BatchResultErrorEntry `json:"Failed,omitempty" xml:"BatchResultErrorEntry,omitempty"`
|
||||
}
|
||||
|
||||
type DeleteMessageBatchResponse struct {
|
||||
|
||||
@@ -435,12 +435,11 @@ check_not "Visibility: скрыто сразу после receive" "$R" "vis-msg
|
||||
# Ждём истечения visibility window
|
||||
sleep 3
|
||||
|
||||
# После паузы — снова доступно
|
||||
R=$(sqs "$T1_AK" "$T1_SK" receive-message --queue-url "$VIS_QURL")
|
||||
check "Visibility: сообщение снова доступно" "$R" "vis-msg-${TS}"
|
||||
# После паузы — снова доступно (получаем с VT=30 и сохраняем receipt для CMV)
|
||||
R3=$(sqs "$T1_AK" "$T1_SK" receive-message --queue-url "$VIS_QURL" --visibility-timeout 30)
|
||||
check "Visibility: сообщение снова доступно" "$R3" "vis-msg-${TS}"
|
||||
|
||||
# ChangeMessageVisibility — продлить время скрытия ДО истечения
|
||||
R3=$(sqs "$T1_AK" "$T1_SK" receive-message --queue-url "$VIS_QURL" --visibility-timeout 30)
|
||||
VIS_RECEIPT=$(echo "$R3" | jq -r '.Messages[0].ReceiptHandle' 2>/dev/null)
|
||||
if [ -n "$VIS_RECEIPT" ] && [ "$VIS_RECEIPT" != "null" ]; then
|
||||
R=$(sqs "$T1_AK" "$T1_SK" change-message-visibility \
|
||||
|
||||
Reference in New Issue
Block a user