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

Jump to bottom

Update jobs.json to latest generated swagger file as well as it's updated examples #2909

Merged
merged 4 commits into from
May 17, 2018
Merged

Update jobs.json to latest generated swagger file as well as it's updated examples #2909

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
734f2e9
Updates to jobs.json as well as examples, this time keeping out readm…
Apr 20, 2018
457eb46
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
May 17, 2018
748aec0
Updated readme.md to include jobs.json. Fixed job step output examples
May 17, 2018
a74684b
Fixing readme.md based on feedback. Ordered jobs.json alphabetically …
May 17, 2018
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
42 changes: 21 additions & 21 deletions ...e-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/CreateOrUpdateJobStepMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"resourceGroupName":"group3",
"serverName":"server3",
"databaseName":"database3",
"schemaName":"myschema1234",
"tableName":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
Expand All @@ -50,14 +50,14 @@
"value":"select 2"
},
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
"type": "SqlDatabase",
"subscriptionId": "3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroupName": "group3",
"serverName": "server3",
"databaseName": "database3",
"schemaName": "myschema1234",
"tableName": "mytable5678",
"credential": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
"timeoutSeconds":1234,
Expand All @@ -84,14 +84,14 @@
"value":"select 2"
},
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
"type": "SqlDatabase",
"subscriptionId": "3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroupName": "group3",
"serverName": "server3",
"databaseName": "database3",
"schemaName": "myschema1234",
"tableName": "mytable5678",
"credential": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
"timeoutSeconds":1234,
Expand Down
10 changes: 5 additions & 5 deletions ...l/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/GetJobStepByJob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"resourceGroupName":"group3",
"serverName":"server3",
"databaseName":"database3",
"schemaName":"myschema1234",
"tableName":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
Expand Down
10 changes: 5 additions & 5 deletions ...source-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/GetJobStepByVersion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"resourceGroupName":"group3",
"serverName":"server3",
"databaseName":"database3",
"schemaName":"myschema1234",
"tableName":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
Expand Down
20 changes: 10 additions & 10 deletions ...resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ListJobStepsByJob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"resourceGroupName":"group3",
"serverName":"server3",
"databaseName":"database3",
"schemaName":"myschema1234",
"tableName":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
Expand Down Expand Up @@ -56,11 +56,11 @@
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"resourceGroupName":"group3",
"serverName":"server3",
"databaseName":"database3",
"schemaName":"myschema1234",
"tableName":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
Expand Down
20 changes: 10 additions & 10 deletions ...urce-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ListJobStepsByVersion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"resourceGroupName":"group3",
"serverName":"server3",
"databaseName":"database3",
"schemaName":"myschema1234",
"tableName":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
Expand Down Expand Up @@ -57,11 +57,11 @@
"output":{
"type":"SqlDatabase",
"subscriptionId":"3501b905-a848-4b5d-96e8-b253f62d735a",
"resourceGroup":"group3",
"server":"server3",
"database":"database3",
"schema":"myschema1234",
"table":"mytable5678",
"resourceGroupName":"group3",
"serverName":"server3",
"databaseName":"database3",
"schemaName":"myschema1234",
"tableName":"mytable5678",
"credential":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/servers/server1/jobAgents/agent1/credentials/cred0"
},
"executionOptions":{
Expand Down
7 changes: 7 additions & 0 deletions specification/sql/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ Differences in v3 (compared to v2):
- `+2017-10-01-preview/capabilities.json`
- `+2017-10-01-preview/databases.json`
- `+2017-10-01-preview/elasticPools.json`
- New SQL database agent APIs
Copy link
Contributor

Choose a reason for hiding this comment

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

This should not be a difference between v3 and v2, because jobs.json is in all composite version (v3, v2, v1)

Copy link
Contributor

Choose a reason for hiding this comment

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

In other words: please delete the new line 54 & 55 :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You got it :)

- `+2017-03-01/jobs.json`

``` yaml $(tag) == 'package-composite-v3'
input-file:
Expand Down Expand Up @@ -90,6 +92,7 @@ input-file:
- Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json
- Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json
- Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json
- Microsoft.Sql/preview/2017-03-01-preview/jobs.json
Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't add to readme.md until we are ready to publish SDK.

- Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json
- Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json
- Microsoft.Sql/preview/2017-10-01-preview/capabilities.json
Expand Down Expand Up @@ -162,6 +165,7 @@ input-file:
- Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json
- Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json
- Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json
- Microsoft.Sql/preview/2017-03-01-preview/jobs.json
- Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json
- Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json
- Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json
Expand Down Expand Up @@ -224,6 +228,7 @@ input-file:
- Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json
- Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json
- Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json
- Microsoft.Sql/preview/2017-03-01-preview/jobs.json
- Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json
- Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json
- Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json
Expand Down Expand Up @@ -287,6 +292,7 @@ input-file:
- Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json
- Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json
- Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json
- Microsoft.Sql/preview/2017-03-01-preview/jobs.json
Copy link
Contributor

Choose a reason for hiding this comment

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

please keep in alphabetical order (in all the sections you added to)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will update to be in alphabetical order.


# Needed when there is more than one input file
override-info:
Expand Down Expand Up @@ -418,6 +424,7 @@ input-file:
- ./Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json
- ./Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json
- ./Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json
- ./Microsoft.Sql/preview/2017-03-01-preview/jobs.json

# Needed when there is more than one input file
override-info:
Expand Down