Skip to content

Commit 98f1e6b

Browse files
kasobol-msftkasobol-msft
authored
Don't send ip range in tests. (Azure#21031)
* prefer ipv4 stack. * try this * roll back that. * is this even a problem? * not this. * how about this? * how about this? * nope. * I don't like maven. * Revert "I don't like maven." This reverts commit 83506ab. * either co-location or range... * fix more tests. * more recordings.. * query tests are flaky. * docs.
1 parent 8da11f9 commit 98f1e6b

File tree

35 files changed

+1206
-1228
lines changed

35 files changed

+1206
-1228
lines changed

‎sdk/storage/azure-storage-blob-batch/src/test/java/com/azure/storage/blob/batch/BatchAPITest.groovy‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -958,9 +958,6 @@ class BatchAPITest extends APISpec {
958958
def sasValues = new BlobServiceSasSignatureValues(getUTCNow().plusDays(1), permission)
959959
.setStartTime(getUTCNow().minusDays(1))
960960
.setProtocol(SasProtocol.HTTPS_HTTP)
961-
.setSasIpRange(new SasIpRange()
962-
.setIpMin("0.0.0.0")
963-
.setIpMax("255.255.255.255"))
964961
.setCacheControl("cache")
965962
.setContentDisposition("disposition")
966963
.setContentEncoding("encoding")
@@ -1004,9 +1001,6 @@ class BatchAPITest extends APISpec {
10041001
def sasValues = new BlobServiceSasSignatureValues(getUTCNow().plusDays(1), permission)
10051002
.setStartTime(getUTCNow().minusDays(1))
10061003
.setProtocol(SasProtocol.HTTPS_HTTP)
1007-
.setSasIpRange(new SasIpRange()
1008-
.setIpMin("0.0.0.0")
1009-
.setIpMax("255.255.255.255"))
10101004
.setCacheControl("cache")
10111005
.setContentDisposition("disposition")
10121006
.setContentEncoding("encoding")

‎sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestsubmitbatchwithcontainersascredentials.json‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
{
22
"networkCallRecords" : [ {
33
"Method" : "PUT",
4-
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials0838249e960876?restype=container",
4+
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials020535d0b6cc45?restype=container",
55
"Headers" : {
66
"x-ms-version" : "2020-06-12",
7-
"User-Agent" : "azsdk-java-azure-storage-blob/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
8-
"x-ms-client-request-id" : "24a14cae-aab0-4008-8c2a-29bf8ec57bb1"
7+
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.4 (11.0.8; Windows 10; 10.0)",
8+
"x-ms-client-request-id" : "b5420284-aa47-4d8e-81ca-006f59943ca9"
99
},
1010
"Response" : {
11+
"content-length" : "0",
1112
"x-ms-version" : "2020-06-12",
1213
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
13-
"ETag" : "0x8D8B29DC7685DB8",
14-
"Last-Modified" : "Wed, 06 Jan 2021 23:49:59 GMT",
14+
"eTag" : "0x8D90AD2E8E9E920",
15+
"Last-Modified" : "Thu, 29 Apr 2021 05:52:01 GMT",
1516
"retry-after" : "0",
16-
"Content-Length" : "0",
1717
"StatusCode" : "201",
18-
"x-ms-request-id" : "52eff8b3-801e-0000-1886-e425a9000000",
19-
"Date" : "Wed, 06 Jan 2021 23:49:59 GMT",
20-
"x-ms-client-request-id" : "24a14cae-aab0-4008-8c2a-29bf8ec57bb1"
18+
"x-ms-request-id" : "90a02457-c01e-0009-5abb-3cb3f2000000",
19+
"x-ms-client-request-id" : "b5420284-aa47-4d8e-81ca-006f59943ca9",
20+
"Date" : "Thu, 29 Apr 2021 05:52:01 GMT"
2121
},
2222
"Exception" : null
2323
}, {
2424
"Method" : "PUT",
25-
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials0838249e960876/javablobsubmitbatchwithcontainersascredentials16349669a84",
25+
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials020535d0b6cc45/javablobsubmitbatchwithcontainersascredentials198225e36bd",
2626
"Headers" : {
2727
"x-ms-version" : "2020-06-12",
28-
"User-Agent" : "azsdk-java-azure-storage-blob/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
29-
"x-ms-client-request-id" : "3dad66f4-c723-4997-b89c-186cf0ff99bd"
28+
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.4 (11.0.8; Windows 10; 10.0)",
29+
"x-ms-client-request-id" : "f28e0d61-afbc-4ea6-8441-abd7df2050f3"
3030
},
3131
"Response" : {
32+
"content-length" : "0",
3233
"x-ms-version" : "2020-06-12",
3334
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
34-
"ETag" : "0x8D8B29DC7764FA1",
35-
"Last-Modified" : "Wed, 06 Jan 2021 23:49:59 GMT",
36-
"x-ms-version-id" : "2021-01-06T23:49:59.8954401Z",
35+
"eTag" : "0x8D90AD2E92548D7",
36+
"Last-Modified" : "Thu, 29 Apr 2021 05:52:02 GMT",
37+
"x-ms-version-id" : "2021-04-29T05:52:02.0580567Z",
3738
"retry-after" : "0",
38-
"Content-Length" : "0",
3939
"StatusCode" : "201",
40-
"x-ms-request-id" : "52eff8b6-801e-0000-1a86-e425a9000000",
40+
"x-ms-request-id" : "90a0247a-c01e-0009-74bb-3cb3f2000000",
4141
"x-ms-request-server-encrypted" : "true",
42-
"Date" : "Wed, 06 Jan 2021 23:49:59 GMT",
43-
"x-ms-client-request-id" : "3dad66f4-c723-4997-b89c-186cf0ff99bd"
42+
"x-ms-client-request-id" : "f28e0d61-afbc-4ea6-8441-abd7df2050f3",
43+
"Date" : "Thu, 29 Apr 2021 05:52:01 GMT"
4444
},
4545
"Exception" : null
4646
}, {
4747
"Method" : "PUT",
48-
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials0838249e960876/javablobsubmitbatchwithcontainersascredentials2007443ad54",
48+
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials020535d0b6cc45/javablobsubmitbatchwithcontainersascredentials26574825c8e",
4949
"Headers" : {
5050
"x-ms-version" : "2020-06-12",
51-
"User-Agent" : "azsdk-java-azure-storage-blob/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
52-
"x-ms-client-request-id" : "595aebff-4028-4720-b666-056f7c400fca"
51+
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.4 (11.0.8; Windows 10; 10.0)",
52+
"x-ms-client-request-id" : "3320e983-17cb-464d-9b61-7844c08be4b7"
5353
},
5454
"Response" : {
55+
"content-length" : "0",
5556
"x-ms-version" : "2020-06-12",
5657
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
57-
"ETag" : "0x8D8B29DC7845771",
58-
"Last-Modified" : "Wed, 06 Jan 2021 23:49:59 GMT",
59-
"x-ms-version-id" : "2021-01-06T23:49:59.9873905Z",
58+
"eTag" : "0x8D90AD2E9365E67",
59+
"Last-Modified" : "Thu, 29 Apr 2021 05:52:02 GMT",
60+
"x-ms-version-id" : "2021-04-29T05:52:02.1710201Z",
6061
"retry-after" : "0",
61-
"Content-Length" : "0",
6262
"StatusCode" : "201",
63-
"x-ms-request-id" : "52eff8c3-801e-0000-2786-e425a9000000",
63+
"x-ms-request-id" : "90a02488-c01e-0009-01bb-3cb3f2000000",
6464
"x-ms-request-server-encrypted" : "true",
65-
"Date" : "Wed, 06 Jan 2021 23:49:59 GMT",
66-
"x-ms-client-request-id" : "595aebff-4028-4720-b666-056f7c400fca"
65+
"x-ms-client-request-id" : "3320e983-17cb-464d-9b61-7844c08be4b7",
66+
"Date" : "Thu, 29 Apr 2021 05:52:02 GMT"
6767
},
6868
"Exception" : null
6969
}, {
7070
"Method" : "POST",
71-
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials0838249e960876?restype=container&comp=batch&sv=2020-06-12&spr=https%2Chttp&st=2021-01-05T23%3A50%3A01Z&se=2021-01-07T23%3A50%3A01Z&sip=0.0.0.0-255.255.255.255&sr=c&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
71+
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials020535d0b6cc45?restype=container&comp=batch&sv=2020-06-12&spr=https%2Chttp&st=2021-04-28T05%3A52%3A02Z&se=2021-04-30T05%3A52%3A02Z&sr=c&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
7272
"Headers" : {
7373
"x-ms-version" : "2020-06-12",
74-
"User-Agent" : "azsdk-java-azure-storage-blob/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
75-
"x-ms-client-request-id" : "de17c39f-3321-4f37-870b-ba3387d0f21a",
76-
"Content-Type" : "multipart/mixed; boundary=batch_38a8e69f-2aab-4e8a-8afe-0c20ba0e5fd1"
74+
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.4 azsdk-java-azure-storage-blob-batch/12.9.0-beta.4 (11.0.8; Windows 10; 10.0)",
75+
"x-ms-client-request-id" : "64622ae3-1882-478d-adab-18daee8add4a",
76+
"Content-Type" : "multipart/mixed; boundary=batch_4786bb52-6077-445f-a9cd-7ab2f3612bc0"
7777
},
7878
"Response" : {
7979
"Transfer-Encoding" : "chunked",
8080
"x-ms-version" : "2020-06-12",
8181
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
8282
"retry-after" : "0",
8383
"StatusCode" : "202",
84-
"x-ms-request-id" : "52eff8dc-801e-0000-3786-e425a9000000",
85-
"Body" : "--batchresponse_ce21815d-6054-49c6-93e1-c1a86d4d82c6\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 52eff8dc-801e-0000-3786-e425a91ea4e2\r\nx-ms-version: 2020-06-12\r\nx-ms-client-request-id: f009137d-806f-4bea-b586-1b3098fc1577\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_ce21815d-6054-49c6-93e1-c1a86d4d82c6\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 52eff8dc-801e-0000-3786-e425a91ea4e4\r\nx-ms-version: 2020-06-12\r\nx-ms-client-request-id: 288106a9-c108-40b8-9afb-5453d9d1da90\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_ce21815d-6054-49c6-93e1-c1a86d4d82c6--",
86-
"Date" : "Wed, 06 Jan 2021 23:49:59 GMT",
87-
"x-ms-client-request-id" : "de17c39f-3321-4f37-870b-ba3387d0f21a",
88-
"Content-Type" : "multipart/mixed; boundary=batchresponse_ce21815d-6054-49c6-93e1-c1a86d4d82c6"
84+
"x-ms-request-id" : "90a0249f-c01e-0009-15bb-3cb3f2000000",
85+
"Body" : "--batchresponse_15391868-c64c-47b9-93f2-6138f03c214f\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 90a0249f-c01e-0009-15bb-3cb3f21e51ba\r\nx-ms-version: 2020-06-12\r\nx-ms-client-request-id: 31da2238-362b-42fc-ba93-ba257b22175b\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_15391868-c64c-47b9-93f2-6138f03c214f\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 90a0249f-c01e-0009-15bb-3cb3f21e51bc\r\nx-ms-version: 2020-06-12\r\nx-ms-client-request-id: 521495de-e092-423a-a791-4b95caa70fb4\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_15391868-c64c-47b9-93f2-6138f03c214f--",
86+
"x-ms-client-request-id" : "64622ae3-1882-478d-adab-18daee8add4a",
87+
"Date" : "Thu, 29 Apr 2021 05:52:02 GMT",
88+
"Content-Type" : "multipart/mixed; boundary=batchresponse_15391868-c64c-47b9-93f2-6138f03c214f"
8989
},
9090
"Exception" : null
9191
}, {
9292
"Method" : "DELETE",
93-
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials0838249e960876?restype=container",
93+
"Uri" : "https://REDACTED.blob.core.windows.net/jtcsubmitbatchwithcontainersascredentials020535d0b6cc45?restype=container",
9494
"Headers" : {
9595
"x-ms-version" : "2020-06-12",
96-
"User-Agent" : "azsdk-java-azure-storage-blob/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
97-
"x-ms-client-request-id" : "0260cc71-2ccc-4d97-bbd1-76fd60dec12b"
96+
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.4 (11.0.8; Windows 10; 10.0)",
97+
"x-ms-client-request-id" : "fa8c6e7a-a794-473c-92cf-14850cecaad8"
9898
},
9999
"Response" : {
100+
"content-length" : "0",
100101
"x-ms-version" : "2020-06-12",
101102
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
102103
"retry-after" : "0",
103-
"Content-Length" : "0",
104104
"StatusCode" : "202",
105-
"x-ms-request-id" : "52eff8eb-801e-0000-4586-e425a9000000",
106-
"Date" : "Wed, 06 Jan 2021 23:49:59 GMT",
107-
"x-ms-client-request-id" : "0260cc71-2ccc-4d97-bbd1-76fd60dec12b"
105+
"x-ms-request-id" : "90a024b8-c01e-0009-29bb-3cb3f2000000",
106+
"x-ms-client-request-id" : "fa8c6e7a-a794-473c-92cf-14850cecaad8",
107+
"Date" : "Thu, 29 Apr 2021 05:52:02 GMT"
108108
},
109109
"Exception" : null
110110
} ],
111-
"variables" : [ "jtcsubmitbatchwithcontainersascredentials0838249e960876", "javablobsubmitbatchwithcontainersascredentials16349669a84", "javablobsubmitbatchwithcontainersascredentials2007443ad54", "2021-01-06T23:50:01.198431Z", "2021-01-06T23:50:01.206403200Z" ]
111+
"variables" : [ "jtcsubmitbatchwithcontainersascredentials020535d0b6cc45", "javablobsubmitbatchwithcontainersascredentials198225e36bd", "javablobsubmitbatchwithcontainersascredentials26574825c8e", "2021-04-29T05:52:02.405404300Z", "2021-04-29T05:52:02.429408900Z" ]
112112
}

0 commit comments

Comments
 (0)