Skip to content

Commit

Permalink
Merge stg 78 (#22498)
Browse files Browse the repository at this point in the history
* Set up STG78 branch (#21634)

* Generated off latest version of blob swagger (#21644)

* Reenabled quick query parquet support (#21785)

* Implemented Immutable Storage with Versioning (#21718)

* File listing v2 (#21720)

* swagger generation and hookup

regenerated files swagger for listing
hooked up generated and handwritten models
expanded client API to support new models

* testing and fixes

expanded test parameters for file listing.
swagger transform added.

* rerecorded file listing test

* more testing

also fixed a method name casing

* docstrings and samples

* checkstyle

* reverted primative boolean extended info arg

REST api accepts true or an absence of value. Alligning with .NET for
now on Boolean vs boolean.

* checkpoint

* pr feedback

* misused variable fix

* fixed test

* send nothing, not false: include-extended-info

other minor fixes
rerecorded tests

* import cleanup

* swagger regeneration and test fixes

* API comments

extendedInfo boolean => Boolean
renamed options class

* reidentified samples for options class name change

Co-authored-by: jschrepp-MSFT <[email protected]>

* Fix test.

* Implemented list deleted root blob with versions (#21996)

* Addressed comments for immutable storage with versioning (#22388)

* Develop on main, part 1 (#22451)

* move back service version.

* pin CI.

* fix ci.

* fix ci ?

* fix live tests ?

* use latest service version to filter if not specified in variable.

* use latest service version to filter if not specified in variable.

* does this work ??

* missing stuff.

* move that piece to parent as well.

* rollback yml changes in favor of pom.xml

* fix build ?

* how about this ?

* more ?

* not this.

* rollback some.

* does this work ??

Co-authored-by: Gauri Prasad <[email protected]>
Co-authored-by: gapra <[email protected]>
Co-authored-by: James <[email protected]>
Co-authored-by: jschrepp-MSFT <[email protected]>
  • Loading branch information
5 people authored Jun 24, 2021
1 parent c510457 commit 2fe662b
Show file tree
Hide file tree
Showing 354 changed files with 15,006 additions and 9,196 deletions.
8 changes: 4 additions & 4 deletions eng/DependencyGraph/gen-dep-graph-data.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Library {
$retString += " `"deps`": [`n"
$first = $true
foreach($item in $this.DepHash.GetEnumerator() | Sort-Object Name)
{
{
if (!$first)
{
$retString += ",`n"
Expand All @@ -62,15 +62,15 @@ class Library {
}
}

# While this is similar to library there are no dependencies and the
# While this is similar to library there are no dependencies and the
# type will be "internalbinary". This entry is applicable to client libraries
# which aren't being built AKA dependencies. Note: If we opt to include
# external_dependencies then the type will be "external".
class Dependency {
[string]$id # <groupId>:<artifactId>:<version>
[string]$name # <groupId>:<artifactId>
[string]$version
[string]$type = "internalbinary"
[string]$type = "internalbinary"
Dependency(
[string]$groupId,
[string]$artifactId,
Expand Down Expand Up @@ -116,7 +116,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {

$xmlPomFile = New-Object xml
$xmlPomFile.Load($pomFile)
if ($ValidParents -notcontains $xmlPomFile.project.parent.artifactId)
if ($ValidParents -notcontains $xmlPomFile.project.parent.artifactId)
{
return
}
Expand Down
4 changes: 4 additions & 0 deletions sdk/parents/azure-client-sdk-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1159,6 +1159,7 @@
<systemPropertyVariables>
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
</systemPropertyVariables>
<systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
</configuration>
</plugin>
</plugins>
Expand All @@ -1183,6 +1184,7 @@
<systemPropertyVariables>
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
</systemPropertyVariables>
<systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
</configuration>
</plugin>
</plugins>
Expand All @@ -1206,6 +1208,7 @@
<systemPropertyVariables>
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
</systemPropertyVariables>
<systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
</configuration>
</plugin>
</plugins>
Expand All @@ -1230,6 +1233,7 @@
<systemPropertyVariables>
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
</systemPropertyVariables>
<systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
</configuration>
</plugin>
</plugins>
Expand Down
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-blob-batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<properties>
<src.dir>src/main/java</src.dir>
<test.dir>src/test/java</test.dir>
<AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
</properties>

<pluginRepositories>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,110 +1,112 @@
{
"networkCallRecords" : [ {
"Method" : "PUT",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2?restype=container",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25?restype=container",
"Headers" : {
"x-ms-version" : "2020-08-04",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
"x-ms-client-request-id" : "f65c7aef-a598-4791-8b0b-d193e4065434"
"x-ms-version" : "2020-10-02",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "544237d3-45f9-4e77-b4de-66d4ef75fc87"
},
"Response" : {
"content-length" : "0",
"x-ms-version" : "2020-08-04",
"x-ms-version" : "2020-10-02",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"eTag" : "0x8D910AE32D3E473",
"Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
"eTag" : "0x8D9171827D42C45",
"Last-Modified" : "Fri, 14 May 2021 20:37:56 GMT",
"retry-after" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "83e24597-b01e-0063-6d97-42574a000000",
"x-ms-client-request-id" : "f65c7aef-a598-4791-8b0b-d193e4065434",
"Date" : "Thu, 06 May 2021 16:44:21 GMT"
"x-ms-request-id" : "94cdc414-601e-006f-3501-49d031000000",
"x-ms-client-request-id" : "544237d3-45f9-4e77-b4de-66d4ef75fc87",
"Date" : "Fri, 14 May 2021 20:37:55 GMT"
},
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2/586f4ef51586f4ef5c4512822a10e2b4fda53485aa0a",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25/586f4ef51586f4ef5fec361939908d560887545fda8a",
"Headers" : {
"x-ms-version" : "2020-08-04",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
"x-ms-client-request-id" : "4ae1e420-c619-45fe-83da-a01201b7f146"
"x-ms-version" : "2020-10-02",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "168e0670-f4eb-4d6a-ae84-329766b04144"
},
"Response" : {
"content-length" : "0",
"x-ms-version" : "2020-08-04",
"x-ms-version" : "2020-10-02",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"eTag" : "0x8D910AE330960B1",
"Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
"eTag" : "0x8D9171828155F04",
"Last-Modified" : "Fri, 14 May 2021 20:37:56 GMT",
"x-ms-version-id" : "2021-05-14T20:37:56.8779012Z",
"retry-after" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "346665ad-d01e-0017-4a97-4263ba000000",
"x-ms-request-id" : "94cdc51c-601e-006f-1001-49d031000000",
"x-ms-request-server-encrypted" : "true",
"x-ms-client-request-id" : "4ae1e420-c619-45fe-83da-a01201b7f146",
"Date" : "Thu, 06 May 2021 16:44:20 GMT"
"x-ms-client-request-id" : "168e0670-f4eb-4d6a-ae84-329766b04144",
"Date" : "Fri, 14 May 2021 20:37:56 GMT"
},
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2/586f4ef52586f4ef5c45941367ea8318fa03f4588bc7",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25/586f4ef52586f4ef5fec7803856f4560506884da79bb",
"Headers" : {
"x-ms-version" : "2020-08-04",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
"x-ms-client-request-id" : "920f3112-4883-4a06-98ef-e3f0409e4485"
"x-ms-version" : "2020-10-02",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "5d7431d3-7d54-44cc-b674-069343a8e7d0"
},
"Response" : {
"content-length" : "0",
"x-ms-version" : "2020-08-04",
"x-ms-version" : "2020-10-02",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"eTag" : "0x8D910AE3318578F",
"Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
"eTag" : "0x8D9171828319EB5",
"Last-Modified" : "Fri, 14 May 2021 20:37:57 GMT",
"x-ms-version-id" : "2021-05-14T20:37:57.0630325Z",
"retry-after" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "83e24685-b01e-0063-2497-42574a000000",
"x-ms-request-id" : "94cdc55d-601e-006f-4d01-49d031000000",
"x-ms-request-server-encrypted" : "true",
"x-ms-client-request-id" : "920f3112-4883-4a06-98ef-e3f0409e4485",
"Date" : "Thu, 06 May 2021 16:44:21 GMT"
"x-ms-client-request-id" : "5d7431d3-7d54-44cc-b674-069343a8e7d0",
"Date" : "Fri, 14 May 2021 20:37:56 GMT"
},
"Exception" : null
}, {
"Method" : "POST",
"Uri" : "https://REDACTED.blob.core.windows.net?comp=batch&sv=2020-08-04&ss=b&srt=sco&se=2021-05-07T16%3A44%3A21Z&sp=rdc&sig=REDACTED",
"Uri" : "https://REDACTED.blob.core.windows.net?comp=batch&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A37%3A57Z&sp=rdc&sig=REDACTED",
"Headers" : {
"x-ms-version" : "2020-08-04",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-batch/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
"x-ms-client-request-id" : "835f1660-b5e9-419b-bec0-d0fd8dbe1017",
"Content-Type" : "multipart/mixed; boundary=batch_f52883f0-9edf-4d1c-97a4-15bb47377c5e"
"x-ms-version" : "2020-10-02",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-batch/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "11aaabdc-d2e0-48e2-88ed-ac144c8df7c6",
"Content-Type" : "multipart/mixed; boundary=batch_1f515686-6872-4114-b158-7c6f84ac9c4d"
},
"Response" : {
"Transfer-Encoding" : "chunked",
"x-ms-version" : "2020-08-04",
"x-ms-version" : "2020-10-02",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"retry-after" : "0",
"StatusCode" : "202",
"x-ms-request-id" : "83e246de-b01e-0063-6e97-42574a000000",
"Body" : "--batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd\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: 83e246de-b01e-0063-6e97-42574a1e8c16\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: db7b2546-ceb6-4ab9-b83d-8fc9c3e88434\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd\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: 83e246de-b01e-0063-6e97-42574a1e8c18\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: 735d8d2d-09c2-4c80-962b-a9860ffaed75\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd--",
"x-ms-client-request-id" : "835f1660-b5e9-419b-bec0-d0fd8dbe1017",
"Date" : "Thu, 06 May 2021 16:44:21 GMT",
"Content-Type" : "multipart/mixed; boundary=batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd"
"x-ms-request-id" : "94cdc629-601e-006f-0201-49d031000000",
"Body" : "--batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c\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: 94cdc629-601e-006f-0201-49d0311eb593\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: f1d4ec3b-9db4-4c33-9116-b7dd52fb33b0\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c\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: 94cdc629-601e-006f-0201-49d0311eb597\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: 3d3abd7f-ee88-4cdb-a8dc-f99770f5230d\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c--",
"x-ms-client-request-id" : "11aaabdc-d2e0-48e2-88ed-ac144c8df7c6",
"Date" : "Fri, 14 May 2021 20:37:57 GMT",
"Content-Type" : "multipart/mixed; boundary=batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c"
},
"Exception" : null
}, {
"Method" : "DELETE",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2?restype=container",
"Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25?restype=container",
"Headers" : {
"x-ms-version" : "2020-08-04",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
"x-ms-client-request-id" : "de1b315b-774f-4d63-9e36-7352947762a6"
"x-ms-version" : "2020-10-02",
"User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "33296955-6c6a-4b00-adc5-15251d0aa0b6"
},
"Response" : {
"content-length" : "0",
"x-ms-version" : "2020-08-04",
"x-ms-version" : "2020-10-02",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"retry-after" : "0",
"StatusCode" : "202",
"x-ms-request-id" : "939b4b11-b01e-0001-0997-42956d000000",
"x-ms-client-request-id" : "de1b315b-774f-4d63-9e36-7352947762a6",
"Date" : "Thu, 06 May 2021 16:44:23 GMT"
"x-ms-request-id" : "94cdc751-601e-006f-0501-49d031000000",
"x-ms-client-request-id" : "33296955-6c6a-4b00-adc5-15251d0aa0b6",
"Date" : "Fri, 14 May 2021 20:37:57 GMT"
},
"Exception" : null
} ],
"variables" : [ "586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2", "586f4ef51586f4ef5c4512822a10e2b4fda53485aa0a", "586f4ef52586f4ef5c45941367ea8318fa03f4588bc7", "2021-05-06T16:44:21.858374200Z" ]
"variables" : [ "586f4ef50586f4ef5fec24809af199aa9766744f7a25", "586f4ef51586f4ef5fec361939908d560887545fda8a", "586f4ef52586f4ef5fec7803856f4560506884da79bb", "2021-05-14T20:37:57.272344200Z" ]
}
Loading

0 comments on commit 2fe662b

Please sign in to comment.