Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tables] updating recordings for latest breaking change #16906

Merged
merged 5 commits into from
Jan 25, 2022
Merged

[Tables] updating recordings for latest breaking change #16906

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
628e892
updating recordings for latest breaking change
seankane-msft Jan 24, 2022
26b0046
go mod tidy
seankane-msft Jan 24, 2022
3b2e5b4
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-go into…
seankane-msft Jan 24, 2022
d660d96
reverting eng changes to docker tool instead of proxy direct
seankane-msft Jan 24, 2022
6818df9
running docker dump twice
seankane-msft Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ stages:
EnvVars:
AZURE_RECORD_MODE: 'playback'

- pwsh: |
docker logs ambitious_azsdk_test_proxy
displayName: "Show Docker Logs"
condition: succeededOrFailed()

- ${{ if startsWith(parameters.ServiceDirectory, 'resourcemanager') }}:
- template: /eng/pipelines/templates/jobs/mgmt-mock-test.yml
parameters:
Expand Down
7 changes: 4 additions & 3 deletions eng/pipelines/templates/steps/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ steps:
displayName: "Install Coverage and Junit Dependencies"

- ${{ if eq(parameters.TestProxy, true) }}:
- template: /eng/common/testproxy/test-proxy-tool.yml
- template: /eng/common/testproxy/test-proxy-docker.yml

- task: PowerShell@2
displayName: 'Run Tests'
Expand All @@ -60,8 +60,9 @@ steps:

- ${{ if eq(parameters.TestProxy, true) }}:
- pwsh: |
# $(Build.SourcesDirectory)/test-proxy.log is the hardcoded output log location for the test-proxy-tool.yml
cat $(Build.SourcesDirectory)/test-proxy.log
# ambitious_azsdk_test_proxy is the hardcoded container name used
# by the test proxy startup script
docker logs ambitious_azsdk_test_proxy
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seankane-msft Azure/azure-sdk-tools#2539 is still open and I haven't had time to get to it. I disagree with re-enabling docker here, and you're seeing a bunch of builds fail already.

You're already seeing a bunch of failures unfortunately.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad Scott, I reverted because we had broken builds with the changes we pushed for updating to the latest proxy with x-recording-file in the body. This pushed a newer version of internal@v0.9.0, but it wasn't working with current versions of the tool.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#16921 is reverting the change

displayName: 'Dump Test Proxy logs'
condition: succeededOrFailed()

Expand Down
2 changes: 1 addition & 1 deletion sdk/data/aztables/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ go 1.16
require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.0
github.com/stretchr/testify v1.7.0
)
3 changes: 2 additions & 1 deletion sdk/data/aztables/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0/go.mod h1:TmXReXZ9yPp5D5TBRMTAtyz+UyOl15Py4hL5E5p6igQ=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.0 h1:HMbyI+KfvL+XyuWekow/nWbRxsAhB6+DVzgQTIABecU=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.0/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c=
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
80 changes: 32 additions & 48 deletions sdk/data/aztables/testdata/recordings/TestAddBasicEntity/TestAddBasicEntity_cosmos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@
"RequestUri": "https://fakeaccount.table.cosmos.azure.com/Tables",
"RequestMethod": "POST",
"RequestHeaders": {
":authority": "localhost:5001",
":method": "POST",
":path": "/Tables",
":scheme": "https",
"Accept": "application/json;odata=minimalmetadata",
"Accept-Encoding": "gzip",
"Authorization": "Sanitized",
"Content-Length": "35",
"Content-Type": "application/json",
"dataserviceversion": "3.0",
"User-Agent": "azsdk-go-aztables/v0.2.1 azsdk-go-azcore/v0.20.0 (go1.17; Windows_NT)",
"x-ms-date": "Tue, 26 Oct 2021 20:12:43 GMT",
"User-Agent": "azsdk-go-internal/v0.5.1 azsdk-go-azcore/v0.21.0 (go1.17; Windows_NT)",
"x-ms-date": "Mon, 24 Jan 2022 20:59:43 GMT",
"x-ms-version": "2019-02-02"
},
"RequestBody": {
Expand All @@ -24,34 +21,31 @@
"StatusCode": 201,
"ResponseHeaders": {
"Content-Type": "application/json; odata=minimalmetadata",
"Date": "Tue, 26 Oct 2021 20:12:44 GMT",
"ETag": "W/\u0022datetime\u00272021-10-26T20%3A12%3A43.9023624Z\u0027\u0022",
"Location": "https://seankaneprim.table.cosmos.azure.com/Tables(\u0027tableName4275288239\u0027)",
"Date": "Mon, 24 Jan 2022 20:59:44 GMT",
"ETag": "W/\u0022datetime\u00272022-01-24T20%3A59%3A45.2027912Z\u0027\u0022",
"Location": "https://rosebudprim.table.cosmos.azure.com/Tables(\u0027tableName4275288239\u0027)",
"Transfer-Encoding": "chunked",
"x-ms-request-id": "cba8b448-435c-4b7c-836c-1914c293b5f3"
"x-ms-request-id": "173f9dff-b491-4fe6-83fa-73909b5c42ec"
},
"ResponseBody": {
"TableName": "tableName4275288239",
"odata.metadata": "https://seankaneprim.table.cosmos.azure.com/$metadata#Tables/@Element"
"odata.metadata": "https://rosebudprim.table.cosmos.azure.com/$metadata#Tables/@Element"
}
},
{
"RequestUri": "https://fakeaccount.table.cosmos.azure.com/tableName4275288239",
"RequestMethod": "POST",
"RequestHeaders": {
":authority": "localhost:5001",
":method": "POST",
":path": "/tableName4275288239",
":scheme": "https",
"Accept": "application/json;odata=minimalmetadata",
"Accept-Encoding": "gzip",
"Authorization": "Sanitized",
"Content-Length": "119",
"Content-Type": "application/json",
"dataserviceversion": "3.0",
"prefer": "return-no-content",
"User-Agent": "azsdk-go-aztables/v0.2.1 azsdk-go-azcore/v0.20.0 (go1.17; Windows_NT)",
"x-ms-date": "Tue, 26 Oct 2021 20:12:44 GMT",
"User-Agent": "azsdk-go-internal/v0.5.1 azsdk-go-azcore/v0.21.0 (go1.17; Windows_NT)",
"x-ms-date": "Mon, 24 Jan 2022 20:59:44 GMT",
"x-ms-version": "2019-02-02"
},
"RequestBody": {
Expand All @@ -64,109 +58,99 @@
},
"StatusCode": 204,
"ResponseHeaders": {
"Date": "Tue, 26 Oct 2021 20:12:44 GMT",
"ETag": "W/\u0022datetime\u00272021-10-26T20%3A12%3A44.6281736Z\u0027\u0022",
"Location": "https://seankaneprim.table.cosmos.azure.com/tableName4275288239(PartitionKey=\u0027pk001\u0027,RowKey=\u0027rk001\u0027)",
"Date": "Mon, 24 Jan 2022 20:59:44 GMT",
"ETag": "W/\u0022datetime\u00272022-01-24T20%3A59%3A45.5790088Z\u0027\u0022",
"Location": "https://rosebudprim.table.cosmos.azure.com/tableName4275288239(PartitionKey=\u0027pk001\u0027,RowKey=\u0027rk001\u0027)",
"Preference-Applied": "return-no-content",
"x-ms-request-id": "27bbe2ef-86bb-4f07-8acc-f1acb6f25f62"
"x-ms-request-id": "74e635fb-fb6c-4391-bb20-3be0827ba486"
},
"ResponseBody": null
},
{
"RequestUri": "https://fakeaccount.table.cosmos.azure.com/tableName4275288239(PartitionKey=\u0027pk001\u0027,RowKey=\u0027rk001\u0027)?%24format=application%2Fjson%3Bodata%3Dminimalmetadata",
"RequestMethod": "GET",
"RequestHeaders": {
":authority": "localhost:5001",
":method": "GET",
":path": "/tableName4275288239(PartitionKey=\u0027pk001\u0027,RowKey=\u0027rk001\u0027)?%24format=application%2Fjson%3Bodata%3Dminimalmetadata",
":scheme": "https",
"Accept": "application/json;odata=minimalmetadata",
"Accept-Encoding": "gzip",
"Authorization": "Sanitized",
"dataserviceversion": "3.0",
"User-Agent": "azsdk-go-aztables/v0.2.1 azsdk-go-azcore/v0.20.0 (go1.17; Windows_NT)",
"x-ms-date": "Tue, 26 Oct 2021 20:12:44 GMT",
"User-Agent": "azsdk-go-internal/v0.5.1 azsdk-go-azcore/v0.21.0 (go1.17; Windows_NT)",
"x-ms-date": "Mon, 24 Jan 2022 20:59:44 GMT",
"x-ms-version": "2019-02-02"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/json; odata=minimalmetadata",
"Date": "Tue, 26 Oct 2021 20:12:44 GMT",
"ETag": "W/\u0022datetime\u00272021-10-26T20%3A12%3A44.6281736Z\u0027\u0022",
"Date": "Mon, 24 Jan 2022 20:59:44 GMT",
"ETag": "W/\u0022datetime\u00272022-01-24T20%3A59%3A45.5790088Z\u0027\u0022",
"Transfer-Encoding": "chunked",
"x-ms-request-id": "15d9a678-b870-436a-970d-70176ce2d28d"
"x-ms-request-id": "85041820-f0b1-4a42-bbfe-10fa36695808"
},
"ResponseBody": {
"odata.metadata": "https://seankaneprim.table.cosmos.azure.com/tableName4275288239/$metadata#tableName4275288239/@Element",
"odata.etag": "W/\u0022datetime\u00272021-10-26T20%3A12%3A44.6281736Z\u0027\u0022",
"odata.metadata": "https://rosebudprim.table.cosmos.azure.com/tableName4275288239/$metadata#tableName4275288239/@Element",
"odata.etag": "W/\u0022datetime\u00272022-01-24T20%3A59%3A45.5790088Z\u0027\u0022",
"Bool": true,
"Integer": 10,
"PartitionKey": "pk001",
"RowKey": "rk001",
"String": "abcdef",
"Timestamp": "2021-10-26T20:12:44.6281736Z"
"Timestamp": "2022-01-24T20:59:45.5790088Z"
}
},
{
"RequestUri": "https://fakeaccount.table.cosmos.azure.com/tableName4275288239()?%24filter=PartitionKey\u002Beq\u002B%27pk001%27\u0026%24format=application%2Fjson%3Bodata%3Dminimalmetadata",
"RequestMethod": "GET",
"RequestHeaders": {
":authority": "localhost:5001",
":method": "GET",
":path": "/tableName4275288239()?%24filter=PartitionKey\u002Beq\u002B%27pk001%27\u0026%24format=application%2Fjson%3Bodata%3Dminimalmetadata",
":scheme": "https",
"Accept": "application/json;odata=minimalmetadata",
"Accept-Encoding": "gzip",
"Authorization": "Sanitized",
"dataserviceversion": "3.0",
"User-Agent": "azsdk-go-aztables/v0.2.1 azsdk-go-azcore/v0.20.0 (go1.17; Windows_NT)",
"x-ms-date": "Tue, 26 Oct 2021 20:12:45 GMT",
"User-Agent": "azsdk-go-internal/v0.5.1 azsdk-go-azcore/v0.21.0 (go1.17; Windows_NT)",
"x-ms-date": "Mon, 24 Jan 2022 20:59:44 GMT",
"x-ms-version": "2019-02-02"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/json; odata=minimalmetadata",
"Date": "Tue, 26 Oct 2021 20:12:44 GMT",
"Date": "Mon, 24 Jan 2022 20:59:45 GMT",
"Transfer-Encoding": "chunked",
"x-ms-request-id": "eab332e0-66ac-45aa-ad13-bfe266ac9c16"
"x-ms-request-id": "53e95bfb-96c9-42ce-83f3-4c72dc4c4679"
},
"ResponseBody": {
"value": [
{
"odata.etag": "W/\u0022datetime\u00272021-10-26T20%3A12%3A44.6281736Z\u0027\u0022",
"odata.etag": "W/\u0022datetime\u00272022-01-24T20%3A59%3A45.5790088Z\u0027\u0022",
"Bool": true,
"Integer": 10,
"PartitionKey": "pk001",
"RowKey": "rk001",
"String": "abcdef",
"Timestamp": "2021-10-26T20:12:44.6281736Z"
"Timestamp": "2022-01-24T20:59:45.5790088Z"
}
],
"odata.metadata": "https://seankaneprim.table.cosmos.azure.com/$metadata#tableName4275288239"
"odata.metadata": "https://rosebudprim.table.cosmos.azure.com/$metadata#tableName4275288239"
}
},
{
"RequestUri": "https://fakeaccount.table.cosmos.azure.com/Tables(\u0027tableName4275288239\u0027)",
"RequestMethod": "DELETE",
"RequestHeaders": {
":authority": "localhost:5001",
":method": "DELETE",
":path": "/Tables(\u0027tableName4275288239\u0027)",
":scheme": "https",
"Accept": "application/json",
"Accept-Encoding": "gzip",
"Authorization": "Sanitized",
"User-Agent": "azsdk-go-aztables/v0.2.1 azsdk-go-azcore/v0.20.0 (go1.17; Windows_NT)",
"x-ms-date": "Tue, 26 Oct 2021 20:12:45 GMT",
"User-Agent": "azsdk-go-internal/v0.5.1 azsdk-go-azcore/v0.21.0 (go1.17; Windows_NT)",
"x-ms-date": "Mon, 24 Jan 2022 20:59:44 GMT",
"x-ms-version": "2019-02-02"
},
"RequestBody": null,
"StatusCode": 204,
"ResponseHeaders": {
"Date": "Tue, 26 Oct 2021 20:12:44 GMT",
"x-ms-request-id": "002b75e3-1785-4c6f-a11a-bcafc3e377a1"
"Date": "Mon, 24 Jan 2022 20:59:45 GMT",
"x-ms-request-id": "75898e59-80a7-4c72-adab-fb16f5d1a910"
},
"ResponseBody": null
}
Expand Down
Loading