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

Fix tag sql #16800

Closed
wants to merge 6 commits into from
Closed

Fix tag sql #16800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5acbc2
fix INVALID_FORMAT error from "JobExecutions" in "sql"
ankhyk Nov 17, 2021
3943629
fix INVALID_FORMAT error from "JobStepExecutions" in "sql"
ankhyk Nov 17, 2021
87901ef
fix INVALID_FORMAT error from "JobTargetExecutions" in "sql"
ankhyk Nov 17, 2021
e9a57f3
fix XMS_EXAMPLE_NOTFOUND_ERROR error from "Operations" in "sql"
ankhyk Nov 17, 2021
96a6ced
fix OBJECT_ADDITIONAL_PROPERTIES error from "serviceObjectives" in "sql"
ankhyk Nov 18, 2021
79523db
fix PrettierCheck
ankhyk Nov 19, 2021
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 specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Operations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-examples": {
"List Operations": {
"$ref": "./examples/ListOperations.json"
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...esource-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/CancelJobExecution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
Copy link
Contributor

@ericshape ericshape Nov 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

do we know why we change it? it seems the UUID needs 128 bits?
can you also help to modify all the cases in 2021-02-01-preview and 2021-05-01-preivew? Thanks!
All the example files are auto-generated. Thus, we will change it in the upstream SQL repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

my purpose is to fix example issue for ring0 RP control plane swaggers under default tag
in this example, it report INVALID_FORMAT error about format uuid: 5555-6666-7777-8888-999999999999

Copy link
Member

Choose a reason for hiding this comment

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

@ericshape , should we update examples here then you help apply these changes in the ADO repo coz we don't have auto-sync in place yet?

"api-version": "2020-11-01-preview"
},
"responses": {
Expand Down
2 changes: 1 addition & 1 deletion ...esource-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/CreateJobExecution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"body": {
"properties": {
"jobVersion": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Created",
"provisioningState": "Created",
"createTime": "2016-09-23T01:00:00Z",
Expand Down
6 changes: 3 additions & 3 deletions ...manager/Microsoft.Sql/preview/2020-11-01-preview/examples/CreateOrUpdateJobExecution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"api-version": "2020-11-01-preview"
},
"responses": {
"200": {
"body": {
"properties": {
"jobVersion": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Created",
"provisioningState": "Created",
"createTime": "2017-12-18T19:02:00.8707045Z",
Expand All @@ -29,7 +29,7 @@
"body": {
"properties": {
"jobVersion": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Created",
"provisioningState": "Created",
"createTime": "2017-05-04T19:02:00.8707045Z",
Expand Down
4 changes: 2 additions & 2 deletions ...l/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/GetJobExecution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"api-version": "2020-11-01-preview"
},
"responses": {
"200": {
"body": {
"properties": {
"jobVersion": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Created",
"provisioningState": "Created",
"createTime": "2017-12-21T19:02:00.8707045Z",
Expand Down
4 changes: 2 additions & 2 deletions ...source-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/GetJobExecutionStep.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"stepName": "step1",
"api-version": "2020-11-01-preview"
},
Expand All @@ -16,7 +16,7 @@
"jobVersion": 1,
"stepName": "step1",
"stepId": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Succeeded",
"provisioningState": "Succeeded",
"createTime": "2017-12-27T04:33:15.7189151Z",
Expand Down
4 changes: 2 additions & 2 deletions ...urce-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/GetJobExecutionTarget.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"stepName": "step1",
"targetId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
"api-version": "2020-11-01-preview"
Expand All @@ -17,7 +17,7 @@
"jobVersion": 1,
"stepName": "step1",
"stepId": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Succeeded",
"provisioningState": "Succeeded",
"createTime": "2017-11-05T04:33:17.5133333Z",
Expand Down
4 changes: 2 additions & 2 deletions ...urce-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ListJobExecutionSteps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"api-version": "2020-11-01-preview"
},
"responses": {
Expand All @@ -17,7 +17,7 @@
"jobVersion": 1,
"stepName": "step1",
"stepId": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Succeeded",
"provisioningState": "Succeeded",
"createTime": "2017-12-03T04:33:15.7189151Z",
Expand Down
4 changes: 2 additions & 2 deletions ...Microsoft.Sql/preview/2020-11-01-preview/examples/ListJobExecutionTargetsByExecution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"api-version": "2020-11-01-preview"
},
"responses": {
Expand All @@ -17,7 +17,7 @@
"jobVersion": 1,
"stepName": "step1",
"stepId": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Succeeded",
"provisioningState": "Succeeded",
"createTime": "2017-07-01T04:33:17.5133333Z",
Expand Down
4 changes: 2 additions & 2 deletions ...ager/Microsoft.Sql/preview/2020-11-01-preview/examples/ListJobExecutionTargetsByStep.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serverName": "server1",
"jobAgentName": "agent1",
"jobName": "job1",
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"stepName": "step1",
"api-version": "2020-11-01-preview"
},
Expand All @@ -18,7 +18,7 @@
"jobVersion": 1,
"stepName": "step1",
"stepId": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Succeeded",
"provisioningState": "Succeeded",
"createTime": "2017-07-01T04:33:17.5133333Z",
Expand Down
2 changes: 1 addition & 1 deletion ...e-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ListJobExecutionsByAgent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"properties": {
"jobVersion": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Created",
"provisioningState": "Created",
"createTime": "2017-03-21T19:02:00.8707045Z",
Expand Down
2 changes: 1 addition & 1 deletion ...Microsoft.Sql/preview/2020-11-01-preview/examples/ListJobExecutionsByAgentWithFilter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{
"properties": {
"jobVersion": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Created",
"provisioningState": "Created",
"createTime": "2017-03-21T19:02:00.8707045Z",
Expand Down
2 changes: 1 addition & 1 deletion ...rce-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ListJobExecutionsByJob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"properties": {
"jobVersion": 1,
"jobExecutionId": "5555-6666-7777-8888-999999999999",
"jobExecutionId": "5A86BF65-43AC-F258-2524-9E92992F97CA",
"lifecycle": "Created",
"provisioningState": "Created",
"createTime": "2017-03-21T19:02:00.8707045Z",
Expand Down
10 changes: 10 additions & 0 deletions ...ql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/examples/ListOperations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"parameters": {
"api-version": "2020-11-01-preview"
},
Copy link
Contributor

Choose a reason for hiding this comment

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

do we know why we need to add this example file to 2020-11-01-preview?

all the swagger/example files in SQL are auto-generated from DSMainDev repo since 2020-02-02-preview. Manually updating would break our auto-pipeline. It means this example file needs to update for all the versions after 2020-02-02-preview.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I find 2020-11-01-preview in default tag

``` yaml $(tag) == 'package-composite-v5'
input-file:
- Microsoft.Sql/stable/2014-04-01-legacy/backups_legacy.json
- Microsoft.Sql/stable/2014-04-01/connectionPolicies.json
- Microsoft.Sql/stable/2014-04-01/dataMasking.json
- Microsoft.Sql/stable/2014-04-01/geoBackupPolicies.json
- Microsoft.Sql/stable/2014-04-01/metrics.json
- Microsoft.Sql/stable/2014-04-01-legacy/replicationLinks_legacy.json
- Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json
- Microsoft.Sql/stable/2014-04-01/serviceObjectives.json
- Microsoft.Sql/stable/2014-04-01-legacy/sql.core_legacy.json
- Microsoft.Sql/stable/2014-04-01-legacy/usages_legacy.json
- ./Microsoft.Sql/preview/2020-11-01-preview/BlobAuditing.json
- ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseAdvisors.json
- ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseAutomaticTuning.json
- ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseColumns.json
- ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseRecommendedActions.json

if these are auto-generated, maybe i should revert them

"responses": {
"200": {
"body": {}
}
}
}
1 change: 0 additions & 1 deletion ...on/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServiceObjectiveGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"id": "/subscriptions/b6a6e0c5-e79c-4c6d-a878-72eafbca4cf2/resourceGroups/QA/providers/Microsoft.Sql/servers/nafantest/serviceObjectives/29dd7459-4a7c-4e56-be22-f0adda49440d",
"name": "29dd7459-4a7c-4e56-be22-f0adda49440d",
"type": "Microsoft.Sql/servers/serviceObjectives",
"location": "Central US",
"properties": {
"serviceObjectiveName": "System0",
"isDefault": false,
Expand Down
Loading