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

Modify Workbook Resource Type to include RG and remove unused endpoint #2898

Merged
merged 15 commits into from
Apr 20, 2018
Merged

Modify Workbook Resource Type to include RG and remove unused endpoint #2898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a892e9f
Adding Workbooks resource type.
ericc1103 Mar 29, 2018
aee9914
Rename workbookDelete.json to WorkbookDelete.json
ericc1103 Mar 29, 2018
4ba66aa
Fixed undefiend parameter issue with Delete verb.
ericc1103 Mar 29, 2018
e6041b2
Merge branch 'master' of https://github.com/ericc1103/azure-rest-api-…
ericc1103 Mar 29, 2018
6672215
Update swagger to add subscriptionId
ericc1103 Mar 30, 2018
92ff8e9
Fixed duplicated operation id issue
ericc1103 Mar 30, 2018
c245a85
Removed links endpoint
ericc1103 Apr 3, 2018
bed6bc3
Removed unused samples
ericc1103 Apr 3, 2018
d3bac20
Revert "Removed unused samples"
ericc1103 Apr 3, 2018
5259a41
Revert "Removed links endpoint"
ericc1103 Apr 3, 2018
4227f6c
Removed link logic and added get by resourceid
ericc1103 Apr 5, 2018
328b75c
Applied PR comments
ericc1103 Apr 5, 2018
b742198
Added Resource Group parameter for GET. Removed get by sourceId since…
ericc1103 Apr 18, 2018
15a0dcb
Merged with upstream. Modify Workbook Resource Type to include RG and…
ericc1103 Apr 18, 2018
12a3962
Resolved the merge conflicts with readme.md
ericc1103 Apr 18, 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
51 changes: 0 additions & 51 deletions ...source-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkbooksListBySourceId.json
View file
Open in desktop

This file was deleted.

127 changes: 40 additions & 87 deletions ...licationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,46 @@
}
},
"/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/microsoft.insights/workbooks/{resourceName}": {
"get": {
"description": "Get a single workbook by its resourceName.",
"operationId": "Workbook_Get",
"parameters": [
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "#/parameters/WorkbookResourceNameParameter"
},
{
"$ref": "#/parameters/LocationParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "A workbook definition.",
"schema": {
"$ref": "#/definitions/Workbook"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/WorkbookError"
}
}
},
"x-ms-examples": {
"WorkbookGet": {
"$ref": "./examples/WorkbookGet.json"
}
}
},
"delete": {
"description": "Delete a workbook.",
"operationId": "Workbook_Delete",
Expand Down Expand Up @@ -221,93 +261,6 @@
}
}
}
},
"/subscriptions/{subscriptionId}/providers/microsoft.insights/workbooks/{resourceName}": {
"get": {
"description": "Get a single workbook by its resourceName.",
"operationId": "Workbook_Get",
"parameters": [
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/WorkbookResourceNameParameter"
},
{
"$ref": "#/parameters/LocationParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "A workbook definition.",
"schema": {
"$ref": "#/definitions/Workbook"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/WorkbookError"
}
}
},
"x-ms-examples": {
"WorkbookGet": {
"$ref": "./examples/WorkbookGet.json"
}
}
}
},
"/subscriptions/{subscriptionId}/providers/microsoft.insights/workbooks": {
Copy link
Contributor

Choose a reason for hiding this comment

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

It's a breaking change to remove an operation here. No breaking changes should be made to an existing stable Swagger.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jianghaolu Thanks for reviewing this. This is new resource type that we just got approved last week. This is not deployed to PROD yet. This is the endpoint we overlooked and needed to be removed.

Copy link
Contributor

Choose a reason for hiding this comment

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

@ericc1103 Sounds good. When are you deploying to PROD?

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 am currently working with ARM team and ETA is tomorrow.

Copy link
Contributor

Choose a reason for hiding this comment

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

@ericc1103 Please add "merge on [date]" on the PR title once you have an ETA. I've approved for now and on the deployment date we can merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jianghaolu It is now merged in PROD ARM. You can go ahead and approve to merge.

Copy link
Contributor

Choose a reason for hiding this comment

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

Merging now.

"get": {
"description": "Gets a list of workbooks by sourceId.",
"operationId": "Workbook_List",
"parameters": [
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/SourceIdParameter"
},
{
"$ref": "#/parameters/CategoryParameter"
},
{
"$ref": "#/parameters/TagsParameter"
},
{
"$ref": "#/parameters/CanFetchWorkbookContentParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "A list containing 0 or more workbook definitions.",
"schema": {
"type": "array",
"items": {
"$ref": "#/definitions/Workbook"
}
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/WorkbookError"
}
}
},
"x-ms-examples": {
"WorkbooksListLink": {
"$ref": "./examples/WorkbooksListBySourceId.json"
}
}
}
}
},
"definitions": {
Expand Down