Skip to content

swagger correctness #20147

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

Merged
ruowan merged 4 commits into from
Aug 23, 2022
Merged

swagger correctness #20147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfdced1
swagger correctness
sparatala Aug 8, 2022
36c6f17
Resolved review comments
sparatala Aug 9, 2022
4e91069
Merge branch 'main' into users/v-sparatala/bigdatapools
sparatala Aug 19, 2022
9cb3675
Merge branch 'main' into users/v-sparatala/bigdatapools
sparatala Aug 23, 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
3 changes: 2 additions & 1 deletion custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2716,4 +2716,5 @@ Spza
xlargerc
largerc
mediumrc
smallrc
smallrc
Autotune
5 changes: 5 additions & 0 deletions ...on/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,11 @@
"type": "boolean",
"description": "Whether compute isolation is required or not."
},
"isAutotuneEnabled": {
"type": "boolean",
"title": "Enable Autotune",
"description": "Whether autotune is required or not."
},
"sessionLevelPackagesEnabled": {
"type": "boolean",
"description": "Whether session level packages enabled."
Expand Down
9 changes: 6 additions & 3 deletions ...ager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down Expand Up @@ -66,7 +67,8 @@
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs",
"lastSucceededTimestamp": "1970-01-01T10:00:00Z"
"lastSucceededTimestamp": "1970-01-01T10:00:00Z",
"isAutotuneEnabled": false
}
}
},
Expand Down Expand Up @@ -101,7 +103,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions ...urce-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/DeleteBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down Expand Up @@ -70,7 +71,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion ...esource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/GetBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions ...er/Microsoft.Synapse/preview/2021-06-01-preview/examples/ListBigDataPoolsInWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
},
{
Expand Down Expand Up @@ -68,7 +69,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
],
Expand Down
10 changes: 9 additions & 1 deletion ...manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfiguration_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,15 @@
"createdBy": "test@microsoft.com",
"created": "1970-01-01T00:00:00Z"
},
"etag": "1500474f-0000-0200-0000-5cbe090d0000"
"etag": "1500474f-0000-0200-0000-5cbe090d0000",
"configMergeRule": {
"currentOperation.spark.key1": "append",
"currentOperation.append.separator.spark.key1": "space",
"currentOperation.spark.key2": "append",
"currentOperation.append.separator.spark.key2": "comma",
"allowedNextOperations.spark.key1": "replace,delete",
"allowedNextOperations.spark.key2": "replace,delete,append"
}
}
}
}
Expand Down
20 changes: 18 additions & 2 deletions ...soft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_ListByWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,15 @@
"createdBy": "test@microsoft.com",
"created": "1970-01-01T00:00:00Z"
},
"etag": "1500474f-0000-0200-0000-5cbe090d0000"
"etag": "1500474f-0000-0200-0000-5cbe090d0000",
"configMergeRule": {
"currentOperation.spark.key1": "append",
"currentOperation.append.separator.spark.key1": "space",
"currentOperation.spark.key2": "append",
"currentOperation.append.separator.spark.key2": "comma",
"allowedNextOperations.spark.key1": "replace,delete",
"allowedNextOperations.spark.key2": "replace,delete,append"
}
},
{
"id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkconfigurations/exampleSparkConfigurationName2",
Expand All @@ -57,7 +65,15 @@
"createdBy": "test@microsoft.com",
"created": "1970-01-01T00:00:00Z"
},
"etag": "1500474f-0000-0200-0000-5cbe090d0000"
"etag": "1500474f-0000-0200-0000-5cbe090d0000",
"configMergeRule": {
"currentOperation.spark.key1": "append",
"currentOperation.append.separator.spark.key1": "space",
"currentOperation.spark.key2": "append",
"currentOperation.append.separator.spark.key2": "comma",
"allowedNextOperations.spark.key1": "replace,delete",
"allowedNextOperations.spark.key2": "replace,delete,append"
}
}
],
"nextLink": ""
Expand Down
3 changes: 2 additions & 1 deletion ...urce-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
7 changes: 7 additions & 0 deletions ...pse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sparkConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,13 @@
"type": "string",
"format": "date-time",
"description": "The timestamp of resource creation."
},
"configMergeRule": {
"type": "object",
"description": "SparkConfiguration merge configs.",
"additionalProperties": {
"type": "string"
}
}
},
"required": [
Expand Down
46 changes: 6 additions & 40 deletions specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,11 @@
"type": "boolean",
"description": "Whether compute isolation is required or not."
},
"isAutotuneEnabled": {
"type": "boolean",
"title": "Enable Autotune",
"description": "Whether autotune is required or not."
},
"sessionLevelPackagesEnabled": {
"type": "boolean",
"description": "Whether session level packages enabled."
Expand Down Expand Up @@ -447,7 +452,7 @@
"description": "List of custom libraries/packages associated with the spark pool.",
"type": "array",
"items": {
"$ref": "#/definitions/LibraryInfo"
"$ref": "../../../../common/v1/types.json#/definitions/LibraryInfo"
}
},
"sparkConfigProperties": {
Expand Down Expand Up @@ -558,45 +563,6 @@
}
}
},
"LibraryInfo": {
"type": "object",
"description": "Library/package information of a Big Data pool powered by Apache Spark",
"title": "Information about a library/package created at the workspace level.",
"properties": {
"name": {
"type": "string",
"description": "Name of the library."
},
"path": {
"type": "string",
"description": "Storage blob path of library."
},
"containerName": {
"type": "string",
"description": "Storage blob container name."
},
"uploadedTimestamp": {
"type": "string",
"format": "date-time",
"description": "The last update time of the library.",
"readOnly": true
},
"type": {
"type": "string",
"description": "Type of the library."
},
"provisioningStatus": {
"readOnly": true,
"type": "string",
"description": "Provisioning status of the library/package."
},
"creatorId": {
"readOnly": true,
"type": "string",
"description": "Creator Id of the library/package."
}
}
},
"LibraryRequirements": {
"type": "object",
"description": "Library requirements for a Big Data pool powered by Apache Spark",
Expand Down
9 changes: 6 additions & 3 deletions ...ource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateOrUpdateBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down Expand Up @@ -66,7 +67,8 @@
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs",
"lastSucceededTimestamp": "1970-01-01T10:00:00Z"
"lastSucceededTimestamp": "1970-01-01T10:00:00Z",
"isAutotuneEnabled": false
}
}
},
Expand Down Expand Up @@ -101,7 +103,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions ...apse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/DeleteBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down Expand Up @@ -70,7 +71,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion ...synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/GetBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions ...rce-manager/Microsoft.Synapse/stable/2021-06-01/examples/ListBigDataPoolsInWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
},
{
Expand Down Expand Up @@ -68,7 +69,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion ...apse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateBigDataPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"content": "",
"filename": "requirements.txt"
},
"defaultSparkLogFolder": "/logs"
"defaultSparkLogFolder": "/logs",
"isAutotuneEnabled": false
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/library.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
],
"properties": {
"properties": {
"$ref": "./bigDataPool.json#/definitions/LibraryInfo",
"$ref": "../../../../common/v1/types.json#/definitions/LibraryInfo",
"description": "Library/package properties.",
"x-ms-client-flatten": true
}
Expand Down