From 873272d0ba4bfa79fb732a45c1c5fa8a12219e5a Mon Sep 17 00:00:00 2001 From: Surya Date: Tue, 14 Jul 2020 16:50:48 +0530 Subject: [PATCH 01/17] [Synapse] Add Get Workspace, Read/List BigDataPools, SqlPools, IntegrationRuntimes API spec from the data-plane --- .../2020-01-01-preview/bigDataPools.json | 189 +++++++++++++++++ .../examples/BigDataPools_Get.json | 44 ++++ .../examples/BigDataPools_List.json | 47 +++++ .../examples/IntegrationRuntimes_Get.json | 39 ++++ .../examples/IntegrationRuntimes_List.json | 33 +++ .../examples/SqlPools_Get.json | 39 ++++ .../examples/SqlPools_List.json | 61 ++++++ .../examples/Workspace_Get.json | 47 +++++ .../integrationRuntimes.json | 135 ++++++++++++ .../preview/2020-01-01-preview/sqlPools.json | 193 ++++++++++++++++++ .../preview/2020-01-01-preview/workspace.json | 178 ++++++++++++++++ 11 files changed, 1005 insertions(+) create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json create mode 100644 specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json new file mode 100644 index 000000000000..2cd8cfde4a14 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json @@ -0,0 +1,189 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-01-01-preview", + "title": "SynapseClient" + }, + "x-ms-parameterized-host": { + "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "parameters": [ + { + "name": "workspaceName", + "description": "The name of the workspace to execute operations on.", + "required": true, + "type": "string", + "in": "path", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/SynapseDnsSuffixInPath" + } + ] + }, + "schemes": [ + "https" + ], + "paths": { + "/bigDataPools": { + "get": { + "tags": [ + "BigDataPools" + ], + "operationId": "BigDataPools_List", + "description": "List Big Data Pools", + "x-ms-examples": { + "List Big Data Pools": { + "$ref": "./examples/BigDataPools_List.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "#/definitions/BigDataPoolListResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + } + } + } + } + }, + "/bigDataPools/{bigDataPoolName}": { + "get": { + "tags": [ + "BigDataPools" + ], + "operationId": "BigDataPools_Get", + "description": "Get Big Data Pool", + "x-ms-examples": { + "Get Bit Data Pool": { + "$ref": "./examples/BigDataPools_Get.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/BigDataPoolNameParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "#/definitions/BigDataPoolResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + } + } + } + } + } + }, + "definitions": { + "BigDataPoolListResponse" : { + "description": "A list of BigDataPools in this workspace", + "type": "object", + "required": [ + "value" + ], + "properties": { + "value": { + "type": "array", + "description": "List of Big Data Pools", + "items": { + "$ref": "#/definitions/BigDataPoolResponse" + } + }, + "nextLink": { + "description": "The link to the next page of results, if any remaining results exist.", + "type": "string" + } + } + }, + "BigDataPoolResponse" : { + "description": "BigDataPool information", + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "ARM Resource ID of the BigDataPool" + }, + "location": { + "type": "string", + "description": "Big Data Pool Location" + }, + "name": { + "type": "string", + "description": "Big Data Pool Name" + }, + "type": { + "type": "string", + "description": "Resource type" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + }, + "properties": { + "$ref": "../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceProperties", + "description": "Big Data pool properties", + "x-ms-client-flatten": true + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The Synapse client API Version." + }, + "BigDataPoolNameParameter": { + "name": "bigDataPoolName", + "in": "path", + "required": true, + "type": "string", + "description": "The Big Data Pool name" + }, + "SynapseDnsSuffixInPath": { + "name": "SynapseDnsSuffix", + "in": "path", + "required": true, + "type": "string", + "default": "azuresynapse.net", + "x-ms-skip-url-encoding": true, + "description": "Gets the DNS suffix used as the base for all Synapse service requests.", + "x-ms-parameter-location": "client" + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json new file mode 100644 index 000000000000..bca4300491a8 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "workspaceName": "exampleWorkspace", + "SynapseDnsSuffix": "azuresynapse.net", + "BigDataPoolName" : "pool1", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "creationDate": "2020-07-14T10:09:52.5133333Z", + "sparkVersion": "2.4", + "nodeCount": 3, + "nodeSize": "Small", + "nodeSizeFamily": "MemoryOptimized", + "autoScale": { + "enabled": true, + "minNodeCount": 3, + "maxNodeCount": 20 + }, + "autoPause": { + "enabled": true, + "delayInMinutes": 15 + }, + "provisioningState": "Succeeded" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkComputes/pool1", + "name": "pool1", + "type": "Microsoft.Synapse/workspaces/sparkComputes", + "location": "southeastasia", + "tags": {} + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" + } + } + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json new file mode 100644 index 000000000000..65f24ac825d9 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "workspaceName": "exampleWorkspace", + "SynapseDnsSuffix": "azuresynapse.net", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "creationDate": "2020-07-14T10:09:52.5133333Z", + "sparkVersion": "2.4", + "nodeCount": 3, + "nodeSize": "Small", + "nodeSizeFamily": "MemoryOptimized", + "autoScale": { + "enabled": true, + "minNodeCount": 3, + "maxNodeCount": 20 + }, + "autoPause": { + "enabled": true, + "delayInMinutes": 15 + }, + "provisioningState": "Succeeded" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkComputes/pool1", + "name": "pool1", + "type": "Microsoft.Synapse/workspaces/sparkComputes", + "location": "southeastasia", + "tags": {} + } + ] + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" + } + } + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json new file mode 100644 index 000000000000..05843dd318da --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "workspaceName": "exampleWorkspace", + "SynapseDnsSuffix": "azuresynapse.net", + "IntegrationRuntimeName" : "IntegrationRuntime1", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body" : { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/integrationruntimes/IntegrationRuntime1", + "name": "IntegrationRuntime1", + "type": "Microsoft.Synapse/workspaces/integrationruntimes", + "properties": { + "type": "Managed", + "typeProperties": { + "computeProperties": { + "location": "Australia Southeast", + "dataFlowProperties": { + "computeType": "General", + "coreCount": 8, + "timeToLive": 0 + } + } + } + }, + "etag": "00000000-0000-0000-0000-000000000000" + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" + } + } + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json new file mode 100644 index 000000000000..0c888864f288 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "workspaceName": "exampleWorkspace", + "SynapseDnsSuffix": "azuresynapse.net", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/workspaces/exampleWorkspace/integrationruntimes/exampleIntegrationRuntime", + "name": "exampleIntegrationRuntime", + "type": "Microsoft.Synapse/workspaces/integrationruntimes", + "properties": { + "type": "SelfHosted", + "description": "A selfhosted integration runtime" + }, + "etag": "0400f1a1-0000-0000-0000-5b2188640000" + } + ] + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" + } + } + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json new file mode 100644 index 000000000000..cdfb1f4e89ca --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "workspaceName": "exampleWorkspace", + "SynapseDnsSuffix": "azuresynapse.net", + "SqlPoolName" : "SqlPool1", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "status": "Online", + "maxSizeBytes": 263882790666240, + "collation": "SQL_Latin1_General_CP1_CI_AS", + "restorePointInTime": "0001-01-01T00:00:00", + "creationDate": "2020-06-23T10:47:12.837Z", + "provisioningState": "Succeeded" + }, + "sku": { + "name": "DW100c", + "capacity": 0 + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool1", + "name": "SqlPool1", + "type": "Microsoft.Synapse/workspaces/sqlPools", + "location": "southeastasia", + "tags": {} + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" + } + } + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json new file mode 100644 index 000000000000..23485b6a0405 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json @@ -0,0 +1,61 @@ +{ + "parameters": { + "workspaceName": "exampleWorkspace", + "SynapseDnsSuffix": "azuresynapse.net", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "status": "Online", + "maxSizeBytes": 263882790666240, + "collation": "SQL_Latin1_General_CP1_CI_AS", + "restorePointInTime": "0001-01-01T00:00:00", + "creationDate": "2020-06-23T10:47:12.837Z", + "provisioningState": "Succeeded" + }, + "sku": { + "name": "DW100c", + "capacity": 0 + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool1", + "name": "SqlPool1", + "type": "Microsoft.Synapse/workspaces/sqlPools", + "location": "southeastasia", + "tags": {} + }, + { + "properties": { + "status": "Online", + "maxSizeBytes": 263882790666240, + "collation": "SQL_Latin1_General_CP1_CI_AS", + "restorePointInTime": "0001-01-01T00:00:00", + "creationDate": "2020-06-23T11:10:59.05Z", + "provisioningState": "Succeeded" + }, + "sku": { + "name": "DW100c", + "capacity": 0 + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool2Backup", + "name": "SqlPool2Backup", + "type": "Microsoft.Synapse/workspaces/sqlPools", + "location": "southeastasia", + "tags": {} + } + ] + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" + } + } + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json new file mode 100644 index 000000000000..b74984d39f37 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "workspaceName": "exampleWorkspace", + "SynapseDnsSuffix": "azuresynapse.net", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace", + "location": "southeastasia", + "name": "exampleWorkspace", + "type": "Microsoft.Synapse/workspaces", + "identity": { + "type": "SystemAssigned", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000" + }, + "tags": {}, + "properties": { + "connectivityEndpoints": { + "web": "https://web.azuresynapse.net?workspace=%2fsubscriptions%2f00000000-0000-0000-0000-000000000000%2fresourceGroups%2frg%2fproviders%2fMicrosoft.Synapse%2fworkspaces%2fexampleWorkspace", + "sql": "exampleWorkspace.sql.azuresynapse.net", + "dev": "https://exampleWorkspace.dev.azuresynapse.net", + "sqlOnDemand": "exampleWorkspace-ondemand.sql.azuresynapse.net" + }, + "managedResourceGroupName": "workspacemanagedrg-1a992746-f580-4fce-a696-b0373bc6959a", + "defaultDataLakeStorage": { + "accountUrl": "https://exampleWorkspacedfs.dfs.core.windows.net", + "filesystem": "synapse" + }, + "sqlAdministratorLogin": "sqladminuser", + "privateEndpointConnections": [], + "provisioningState": "Succeeded" + } + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" + } + } + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json new file mode 100644 index 000000000000..41e630674d32 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json @@ -0,0 +1,135 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-01-01-preview", + "title": "SynapseClient" + }, + "x-ms-parameterized-host": { + "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "parameters": [ + { + "name": "workspaceName", + "description": "The name of the workspace to execute operations on.", + "required": true, + "type": "string", + "in": "path", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/SynapseDnsSuffixInPath" + } + ] + }, + "schemes": [ + "https" + ], + "paths": { + "/integrationRuntimes": { + "get": { + "tags": [ + "IntegrationRuntimes" + ], + "operationId": "IntegrationRuntimes_List", + "description": "List Integration Runtimes", + "x-ms-examples": { + "List Integration Runtimes": { + "$ref": "./examples/IntegrationRuntimes_List.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeListResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + } + } + } + } + }, + "/integrationRuntimes/{integrationRuntimeName}": { + "get": { + "tags": [ + "IntegrationRuntimes" + ], + "operationId": "IntegrationRuntimes_Get", + "description": "Get Integration Runtime", + "x-ms-examples": { + "Get Integration Runtime": { + "$ref": "./examples/IntegrationRuntimes_Get.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/IntegrationRuntimeNameParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + } + } + } + } + } + }, + "definitions": { + }, + "parameters": { + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The Synapse client API Version." + }, + "IntegrationRuntimeNameParameter": { + "name": "integrationRuntimeName", + "in": "path", + "required": true, + "type": "string", + "description": "The Integration Runtime name" + }, + "SynapseDnsSuffixInPath": { + "name": "SynapseDnsSuffix", + "in": "path", + "required": true, + "type": "string", + "default": "azuresynapse.net", + "x-ms-skip-url-encoding": true, + "description": "Gets the DNS suffix used as the base for all Synapse service requests.", + "x-ms-parameter-location": "client" + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json new file mode 100644 index 000000000000..8804c1335cd8 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json @@ -0,0 +1,193 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-01-01-preview", + "title": "SynapseClient" + }, + "x-ms-parameterized-host": { + "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "parameters": [ + { + "name": "workspaceName", + "description": "The name of the workspace to execute operations on.", + "required": true, + "type": "string", + "in": "path", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/SynapseDnsSuffixInPath" + } + ] + }, + "schemes": [ + "https" + ], + "paths": { + "/sqlPools": { + "get": { + "tags": [ + "SqlPools" + ], + "operationId": "SqlPools_List", + "description": "List Sql Pools", + "x-ms-examples": { + "List Sql Pools": { + "$ref": "./examples/SqlPools_List.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "#/definitions/SqlPoolListResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + } + } + } + } + }, + "/sqlPools/{sqlPoolName}": { + "get": { + "tags": [ + "SqlPools" + ], + "operationId": "SqlPools_Get", + "description": "Get Sql Pool", + "x-ms-examples": { + "List Sql Pools": { + "$ref": "./examples/SqlPools_Get.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SqlPoolNameParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "#/definitions/SqlPoolResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + } + } + } + } + } + }, + "definitions": { + "SqlPoolListResponse" : { + "description": "A list of SqlPools in this workspace", + "type": "object", + "required": [ + "value" + ], + "properties": { + "value": { + "type": "array", + "description": "List of Sql Pools", + "items": { + "$ref": "#/definitions/SqlPoolResponse" + } + }, + "nextLink": { + "description": "The link to the next page of results, if any remaining results exist.", + "type": "string" + } + } + }, + "SqlPoolResponse" : { + "description": "SqlPool information", + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "ARM Resource ID of the SqlPool" + }, + "location": { + "type": "string", + "description": "Sql Pool Location" + }, + "name": { + "type": "string", + "description": "Sql Pool Name" + }, + "type": { + "type": "string", + "description": "Resource type" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + }, + "sku": { + "$ref": "../../../resource-manager/sqlPool.json#/definitions/Sku", + "description": "SQL pool SKU" + }, + "properties": { + "$ref": "../../../resource-manager/sqlPool.json#/definitions/SqlPoolResourceProperties", + "description": "SQL pool properties", + "x-ms-client-flatten": true + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The Synapse client API Version." + }, + "SqlPoolNameParameter": { + "name": "sqlPoolName", + "in": "path", + "required": true, + "type": "string", + "description": "The Sql Pool name" + }, + "SynapseDnsSuffixInPath": { + "name": "SynapseDnsSuffix", + "in": "path", + "required": true, + "type": "string", + "default": "azuresynapse.net", + "x-ms-skip-url-encoding": true, + "description": "Gets the DNS suffix used as the base for all Synapse service requests.", + "x-ms-parameter-location": "client" + } + } +} \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json new file mode 100644 index 000000000000..d35e69516904 --- /dev/null +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json @@ -0,0 +1,178 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-01-01-preview", + "title": "SynapseClient" + }, + "x-ms-parameterized-host": { + "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "parameters": [ + { + "name": "workspaceName", + "description": "The name of the workspace to execute operations on.", + "required": true, + "type": "string", + "in": "path", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/SynapseDnsSuffixInPath" + } + ] + }, + "schemes": [ + "https" + ], + "paths": { + "/workspace": { + "get": { + "tags": [ + "Workspace" + ], + "operationId": "Workspace_Get", + "description": "Get Workspace", + "x-ms-examples": { + "Get Workspace Information": { + "$ref": "./examples/Workspace_Get.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "#/definitions/WorkspaceResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorContract" + } + } + } + } + } + }, + "definitions": { + "WorkspaceResponse": { + "description": "Workspace information", + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "ARM Resource ID of the Workspace" + }, + "location": { + "type": "string", + "description": "Workspace Location" + }, + "name": { + "type": "string", + "description": "Workspace Name" + }, + "type": { + "type": "string", + "description": "Resource type" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + }, + "identity":{ + "description": "Workspace MSI information", + "$ref" : "../../../resource-manager/workspace.json#/definitions/ManagedIdentity" + }, + "properties":{ + "description": "Workspace Properties", + "$ref" : "../../../resource-manager/workspace.json#/definitions/WorkspaceProperties", + "x-ms-client-flatten": true + } + } + }, + "ErrorContract": { + "title": "Error details.", + "description": "Contains details when the response code indicates an error.", + "type": "object", + "properties": { + "error": { + "description": "The error details.", + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "ErrorResponse": { + "required": [ + "code", + "message" + ], + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "message": { + "type": "string" + }, + "target": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDetail" + } + } + } + }, + "ErrorDetail": { + "required": [ + "code", + "message" + ], + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "message": { + "type": "string" + }, + "target": { + "type": "string" + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The Synapse client API Version." + }, + "SynapseDnsSuffixInPath": { + "name": "SynapseDnsSuffix", + "in": "path", + "required": true, + "type": "string", + "default": "azuresynapse.net", + "x-ms-skip-url-encoding": true, + "description": "Gets the DNS suffix used as the base for all Synapse service requests.", + "x-ms-parameter-location": "client" + } + } +} \ No newline at end of file From a3eb0a16502cc59c3b6d9ebb00daa029a5b8c444 Mon Sep 17 00:00:00 2001 From: Surya Date: Tue, 14 Jul 2020 17:15:15 +0530 Subject: [PATCH 02/17] Refer to new swagger files in the readme --- specification/synapse/data-plane/readme.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/synapse/data-plane/readme.md b/specification/synapse/data-plane/readme.md index 05a24f9f989c..d4343266fe12 100644 --- a/specification/synapse/data-plane/readme.md +++ b/specification/synapse/data-plane/readme.md @@ -65,6 +65,18 @@ input-file: - Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json ``` +### Tag: package-access-control-2020-01-01-preview + +These settings apply only when `--tag=package-access-control-2020-01-01-preview` is specified on the command line. + +``` yaml $(tag) == 'package-access-control-2020-01-01-preview' +input-file: +- Microsoft.Synapse/preview/2020-01-01-preview/workspace.json +- Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json +- Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json +- Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json +``` + ### Tag: package-access-control-2020-02-01-preview These settings apply only when `--tag=package-access-control-2020-02-01-preview` is specified on the command line. From 4d99dfa993bd90978deeabd07e19f9dcfdd5d325 Mon Sep 17 00:00:00 2001 From: Surya Date: Tue, 14 Jul 2020 17:32:28 +0530 Subject: [PATCH 03/17] Update references --- .../preview/2020-01-01-preview/bigDataPools.json | 2 +- .../preview/2020-01-01-preview/integrationRuntimes.json | 4 ++-- .../preview/2020-01-01-preview/sqlPools.json | 4 ++-- .../preview/2020-01-01-preview/workspace.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json index 2cd8cfde4a14..639d3475b271 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json @@ -153,7 +153,7 @@ "description": "Resource tags." }, "properties": { - "$ref": "../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceProperties", + "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceProperties", "description": "Big Data pool properties", "x-ms-client-flatten": true } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json index 41e630674d32..4b861bd4aae5 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json @@ -50,7 +50,7 @@ "200": { "description": "Success response.", "schema": { - "$ref": "../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeListResponse" + "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeListResponse" } }, "default": { @@ -91,7 +91,7 @@ "200": { "description": "Success response.", "schema": { - "$ref": "../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeResource" + "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeResource" } }, "default": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json index 8804c1335cd8..e5bafe025825 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json @@ -153,11 +153,11 @@ "description": "Resource tags." }, "sku": { - "$ref": "../../../resource-manager/sqlPool.json#/definitions/Sku", + "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/Sku", "description": "SQL pool SKU" }, "properties": { - "$ref": "../../../resource-manager/sqlPool.json#/definitions/SqlPoolResourceProperties", + "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/SqlPoolResourceProperties", "description": "SQL pool properties", "x-ms-client-flatten": true } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json index d35e69516904..0c90eb8898c2 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json @@ -93,11 +93,11 @@ }, "identity":{ "description": "Workspace MSI information", - "$ref" : "../../../resource-manager/workspace.json#/definitions/ManagedIdentity" + "$ref" : " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ManagedIdentity" }, "properties":{ "description": "Workspace Properties", - "$ref" : "../../../resource-manager/workspace.json#/definitions/WorkspaceProperties", + "$ref" : " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/WorkspaceProperties", "x-ms-client-flatten": true } } From 78032601d8eb2ce4d4b5fcb85a0f9bfca700c2ff Mon Sep 17 00:00:00 2001 From: Surya Date: Tue, 14 Jul 2020 21:03:13 +0530 Subject: [PATCH 04/17] Update package name --- specification/synapse/data-plane/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/synapse/data-plane/readme.md b/specification/synapse/data-plane/readme.md index d4343266fe12..51e806c42d1e 100644 --- a/specification/synapse/data-plane/readme.md +++ b/specification/synapse/data-plane/readme.md @@ -65,7 +65,7 @@ input-file: - Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json ``` -### Tag: package-access-control-2020-01-01-preview +### Tag: package-arm-artifacts-2020-01-01-preview These settings apply only when `--tag=package-access-control-2020-01-01-preview` is specified on the command line. From d9dc01e5d81ffd163ce225eb2f17389766bda57d Mon Sep 17 00:00:00 2001 From: Surya Date: Wed, 15 Jul 2020 10:39:07 +0530 Subject: [PATCH 05/17] Remove trailing whitespaces and refer to endpoint instead of SynapseDnsSuffix parameter --- .../2020-01-01-preview/bigDataPools.json | 42 +++++++---------- .../examples/BigDataPools_Get.json | 13 +++-- .../examples/BigDataPools_List.json | 13 +++-- .../examples/IntegrationRuntimes_Get.json | 13 +++-- .../examples/IntegrationRuntimes_List.json | 13 +++-- .../examples/SqlPools_Get.json | 13 +++-- .../examples/SqlPools_List.json | 13 +++-- .../examples/Workspace_Get.json | 15 +++--- .../integrationRuntimes.json | 44 +++++++---------- .../preview/2020-01-01-preview/sqlPools.json | 47 ++++++++----------- .../preview/2020-01-01-preview/workspace.json | 30 +++++------- 11 files changed, 109 insertions(+), 147 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json index 639d3475b271..028b217b752b 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json @@ -5,18 +5,11 @@ "title": "SynapseClient" }, "x-ms-parameterized-host": { - "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "hostTemplate": "{endpoint}", + "useSchemePrefix": false, "parameters": [ { - "name": "workspaceName", - "description": "The name of the workspace to execute operations on.", - "required": true, - "type": "string", - "in": "path", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/SynapseDnsSuffixInPath" + "$ref": "#/parameters/Endpoint" } ] }, @@ -24,7 +17,7 @@ "https" ], "paths": { - "/bigDataPools": { + "/bigDataPools": { "get": { "tags": [ "BigDataPools" @@ -41,7 +34,7 @@ "application/json", "text/json" ], - "parameters": [ + "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" } @@ -62,7 +55,7 @@ } } }, - "/bigDataPools/{bigDataPoolName}": { + "/bigDataPools/{bigDataPoolName}": { "get": { "tags": [ "BigDataPools" @@ -79,7 +72,7 @@ "application/json", "text/json" ], - "parameters": [ + "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" }, @@ -153,7 +146,7 @@ "description": "Resource tags." }, "properties": { - "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceProperties", + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceProperties", "description": "Big Data pool properties", "x-ms-client-flatten": true } @@ -168,22 +161,21 @@ "type": "string", "description": "The Synapse client API Version." }, - "BigDataPoolNameParameter": { - "name": "bigDataPoolName", - "in": "path", + "Endpoint": { + "name": "endpoint", + "description": "The workspace development endpoint, for example https://myworkspace.dev.azuresynapse.net.", "required": true, "type": "string", - "description": "The Big Data Pool name" + "in": "path", + "x-ms-skip-url-encoding": true, + "x-ms-parameter-location": "client" }, - "SynapseDnsSuffixInPath": { - "name": "SynapseDnsSuffix", + "BigDataPoolNameParameter": { + "name": "bigDataPoolName", "in": "path", "required": true, "type": "string", - "default": "azuresynapse.net", - "x-ms-skip-url-encoding": true, - "description": "Gets the DNS suffix used as the base for all Synapse service requests.", - "x-ms-parameter-location": "client" + "description": "The Big Data Pool name" } } } \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json index bca4300491a8..5a141789b2c4 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json @@ -1,12 +1,11 @@ -{ - "parameters": { - "workspaceName": "exampleWorkspace", - "SynapseDnsSuffix": "azuresynapse.net", +{ + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", "BigDataPoolName" : "pool1", "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { + }, + "responses": { + "200": { "body": { "properties": { "creationDate": "2020-07-14T10:09:52.5133333Z", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json index 65f24ac825d9..dc28ed37e9a8 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json @@ -1,11 +1,10 @@ -{ - "parameters": { - "workspaceName": "exampleWorkspace", - "SynapseDnsSuffix": "azuresynapse.net", +{ + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { + }, + "responses": { + "200": { "body": { "value": [ { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json index 05843dd318da..fabc12ab07b7 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json @@ -1,12 +1,11 @@ -{ - "parameters": { - "workspaceName": "exampleWorkspace", - "SynapseDnsSuffix": "azuresynapse.net", +{ + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", "IntegrationRuntimeName" : "IntegrationRuntime1", "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { + }, + "responses": { + "200": { "body" : { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/integrationruntimes/IntegrationRuntime1", "name": "IntegrationRuntime1", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json index 0c888864f288..f6939d78d9dd 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json @@ -1,11 +1,10 @@ -{ - "parameters": { - "workspaceName": "exampleWorkspace", - "SynapseDnsSuffix": "azuresynapse.net", +{ + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { + }, + "responses": { + "200": { "body": { "value": [ { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json index cdfb1f4e89ca..f6eaba3cd360 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json @@ -1,12 +1,11 @@ -{ - "parameters": { - "workspaceName": "exampleWorkspace", - "SynapseDnsSuffix": "azuresynapse.net", +{ + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", "SqlPoolName" : "SqlPool1", "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { + }, + "responses": { + "200": { "body": { "properties": { "status": "Online", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json index 23485b6a0405..b3a38e1932ec 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json @@ -1,11 +1,10 @@ -{ - "parameters": { - "workspaceName": "exampleWorkspace", - "SynapseDnsSuffix": "azuresynapse.net", +{ + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { + }, + "responses": { + "200": { "body": { "value": [ { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json index b74984d39f37..d9887abfd3c7 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json @@ -1,12 +1,11 @@ -{ - "parameters": { - "workspaceName": "exampleWorkspace", - "SynapseDnsSuffix": "azuresynapse.net", +{ + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { - "body": { + }, + "responses": { + "200": { + "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace", "location": "southeastasia", "name": "exampleWorkspace", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json index 4b861bd4aae5..0ce6efec4b0a 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json @@ -5,18 +5,11 @@ "title": "SynapseClient" }, "x-ms-parameterized-host": { - "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "hostTemplate": "{endpoint}", + "useSchemePrefix": false, "parameters": [ { - "name": "workspaceName", - "description": "The name of the workspace to execute operations on.", - "required": true, - "type": "string", - "in": "path", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/SynapseDnsSuffixInPath" + "$ref": "#/parameters/Endpoint" } ] }, @@ -24,7 +17,7 @@ "https" ], "paths": { - "/integrationRuntimes": { + "/integrationRuntimes": { "get": { "tags": [ "IntegrationRuntimes" @@ -41,7 +34,7 @@ "application/json", "text/json" ], - "parameters": [ + "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" } @@ -50,7 +43,7 @@ "200": { "description": "Success response.", "schema": { - "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeListResponse" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeListResponse" } }, "default": { @@ -62,7 +55,7 @@ } } }, - "/integrationRuntimes/{integrationRuntimeName}": { + "/integrationRuntimes/{integrationRuntimeName}": { "get": { "tags": [ "IntegrationRuntimes" @@ -79,7 +72,7 @@ "application/json", "text/json" ], - "parameters": [ + "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" }, @@ -91,7 +84,7 @@ "200": { "description": "Success response.", "schema": { - "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeResource" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeResource" } }, "default": { @@ -114,22 +107,21 @@ "type": "string", "description": "The Synapse client API Version." }, - "IntegrationRuntimeNameParameter": { - "name": "integrationRuntimeName", - "in": "path", + "Endpoint": { + "name": "endpoint", + "description": "The workspace development endpoint, for example https://myworkspace.dev.azuresynapse.net.", "required": true, "type": "string", - "description": "The Integration Runtime name" + "in": "path", + "x-ms-skip-url-encoding": true, + "x-ms-parameter-location": "client" }, - "SynapseDnsSuffixInPath": { - "name": "SynapseDnsSuffix", + "IntegrationRuntimeNameParameter": { + "name": "integrationRuntimeName", "in": "path", "required": true, "type": "string", - "default": "azuresynapse.net", - "x-ms-skip-url-encoding": true, - "description": "Gets the DNS suffix used as the base for all Synapse service requests.", - "x-ms-parameter-location": "client" + "description": "The Integration Runtime name" } } } \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json index e5bafe025825..71bcef74f7ed 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json @@ -5,18 +5,11 @@ "title": "SynapseClient" }, "x-ms-parameterized-host": { - "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "hostTemplate": "{endpoint}", + "useSchemePrefix": false, "parameters": [ { - "name": "workspaceName", - "description": "The name of the workspace to execute operations on.", - "required": true, - "type": "string", - "in": "path", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/SynapseDnsSuffixInPath" + "$ref": "#/parameters/Endpoint" } ] }, @@ -24,7 +17,7 @@ "https" ], "paths": { - "/sqlPools": { + "/sqlPools": { "get": { "tags": [ "SqlPools" @@ -41,7 +34,7 @@ "application/json", "text/json" ], - "parameters": [ + "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" } @@ -62,7 +55,7 @@ } } }, - "/sqlPools/{sqlPoolName}": { + "/sqlPools/{sqlPoolName}": { "get": { "tags": [ "SqlPools" @@ -79,7 +72,7 @@ "application/json", "text/json" ], - "parameters": [ + "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" }, @@ -153,18 +146,19 @@ "description": "Resource tags." }, "sku": { - "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/Sku", + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/Sku", "description": "SQL pool SKU" }, "properties": { - "$ref": " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/SqlPoolResourceProperties", + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/SqlPoolResourceProperties", "description": "SQL pool properties", "x-ms-client-flatten": true } } } }, - "parameters": { + "parameters": + { "ApiVersionParameter": { "name": "api-version", "in": "query", @@ -172,22 +166,21 @@ "type": "string", "description": "The Synapse client API Version." }, - "SqlPoolNameParameter": { - "name": "sqlPoolName", - "in": "path", + "Endpoint": { + "name": "endpoint", + "description": "The workspace development endpoint, for example https://myworkspace.dev.azuresynapse.net.", "required": true, "type": "string", - "description": "The Sql Pool name" + "in": "path", + "x-ms-skip-url-encoding": true, + "x-ms-parameter-location": "client" }, - "SynapseDnsSuffixInPath": { - "name": "SynapseDnsSuffix", + "SqlPoolNameParameter": { + "name": "sqlPoolName", "in": "path", "required": true, "type": "string", - "default": "azuresynapse.net", - "x-ms-skip-url-encoding": true, - "description": "Gets the DNS suffix used as the base for all Synapse service requests.", - "x-ms-parameter-location": "client" + "description": "The Sql Pool name" } } } \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json index 0c90eb8898c2..546ff923ba33 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json @@ -5,18 +5,11 @@ "title": "SynapseClient" }, "x-ms-parameterized-host": { - "hostTemplate": "{workspaceName}.{SynapseDnsSuffix}", + "hostTemplate": "{endpoint}", + "useSchemePrefix": false, "parameters": [ { - "name": "workspaceName", - "description": "The name of the workspace to execute operations on.", - "required": true, - "type": "string", - "in": "path", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/SynapseDnsSuffixInPath" + "$ref": "#/parameters/Endpoint" } ] }, @@ -24,7 +17,7 @@ "https" ], "paths": { - "/workspace": { + "/workspace": { "get": { "tags": [ "Workspace" @@ -41,7 +34,7 @@ "application/json", "text/json" ], - "parameters": [ + "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" } @@ -93,11 +86,11 @@ }, "identity":{ "description": "Workspace MSI information", - "$ref" : " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ManagedIdentity" + "$ref" : "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ManagedIdentity" }, "properties":{ "description": "Workspace Properties", - "$ref" : " ../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/WorkspaceProperties", + "$ref" : "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/WorkspaceProperties", "x-ms-client-flatten": true } } @@ -164,14 +157,13 @@ "type": "string", "description": "The Synapse client API Version." }, - "SynapseDnsSuffixInPath": { - "name": "SynapseDnsSuffix", - "in": "path", + "Endpoint": { + "name": "endpoint", + "description": "The workspace development endpoint, for example https://myworkspace.dev.azuresynapse.net.", "required": true, "type": "string", - "default": "azuresynapse.net", + "in": "path", "x-ms-skip-url-encoding": true, - "description": "Gets the DNS suffix used as the base for all Synapse service requests.", "x-ms-parameter-location": "client" } } From 22e262234a7abafc849b1b7134218c8e20a4e89f Mon Sep 17 00:00:00 2001 From: Surya Date: Thu, 16 Jul 2020 13:34:02 +0530 Subject: [PATCH 06/17] Move new swagger and examples inside artifacts folder, and update readme --- .../bigDataPools.json | 2 +- .../examples/BigDataPools_Get.json | 0 .../examples/BigDataPools_List.json | 0 .../examples/IntegrationRuntimes_Get.json | 0 .../examples/IntegrationRuntimes_List.json | 0 .../examples/SqlPools_Get.json | 0 .../examples/SqlPools_List.json | 0 .../examples/Workspace_Get.json | 0 .../integrationRuntimes.json | 2 +- .../sqlPools.json | 2 +- .../workspace.json | 2 +- specification/synapse/data-plane/readme.md | 26 ++++++++----------- 12 files changed, 15 insertions(+), 19 deletions(-) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/bigDataPools.json (99%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/examples/BigDataPools_Get.json (100%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/examples/BigDataPools_List.json (100%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/examples/IntegrationRuntimes_Get.json (100%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/examples/IntegrationRuntimes_List.json (100%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/examples/SqlPools_Get.json (100%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/examples/SqlPools_List.json (100%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/examples/Workspace_Get.json (100%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/integrationRuntimes.json (98%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/sqlPools.json (99%) rename specification/synapse/data-plane/Microsoft.Synapse/preview/{2020-01-01-preview => 2019-06-01-preview}/workspace.json (99%) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json similarity index 99% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index 028b217b752b..73e37e81f367 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "SynapseClient" + "title": "BigDataPoolClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json similarity index 100% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_Get.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_List.json similarity index 100% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/BigDataPools_List.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_List.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json similarity index 100% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_Get.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_List.json similarity index 100% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/IntegrationRuntimes_List.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_List.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json similarity index 100% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_Get.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json similarity index 100% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/SqlPools_List.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/Workspace_Get.json similarity index 100% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/examples/Workspace_Get.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/Workspace_Get.json diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json similarity index 98% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json index 0ce6efec4b0a..93882942fd39 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "SynapseClient" + "title": "IntegrationRuntimeClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json similarity index 99% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index 71bcef74f7ed..1bf49abc34b9 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "SynapseClient" + "title": "SqlPoolClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json similarity index 99% rename from specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json rename to specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 546ff923ba33..9cdbff6fbbe1 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2020-01-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "SynapseClient" + "title": "WorkspaceClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", diff --git a/specification/synapse/data-plane/readme.md b/specification/synapse/data-plane/readme.md index 51e806c42d1e..42c66982590e 100644 --- a/specification/synapse/data-plane/readme.md +++ b/specification/synapse/data-plane/readme.md @@ -63,18 +63,10 @@ These settings apply only when `--tag=package-artifacts-2019-06-01-preview` is s ``` yaml $(tag) == 'package-artifacts-2019-06-01-preview' input-file: - Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json -``` - -### Tag: package-arm-artifacts-2020-01-01-preview - -These settings apply only when `--tag=package-access-control-2020-01-01-preview` is specified on the command line. - -``` yaml $(tag) == 'package-access-control-2020-01-01-preview' -input-file: -- Microsoft.Synapse/preview/2020-01-01-preview/workspace.json -- Microsoft.Synapse/preview/2020-01-01-preview/sqlPools.json -- Microsoft.Synapse/preview/2020-01-01-preview/bigDataPools.json -- Microsoft.Synapse/preview/2020-01-01-preview/integrationRuntimes.json +- Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +- Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +- Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +- Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json ``` ### Tag: package-access-control-2020-02-01-preview @@ -161,7 +153,7 @@ See configuration in [readme.typescript.md](./readme.typescript.md) See configuration in [readme.go.md](./readme.go.md) -## Multi-API/Profile support for AutoRest v3 generators +## Multi-API/Profile support for AutoRest v3 generators AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. @@ -173,6 +165,10 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: + - $(this-folder)/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json + - $(this-folder)/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json + - $(this-folder)/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json + - $(this-folder)/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json - $(this-folder)/Microsoft.Synapse/preview/2019-11-01-preview/sparkJob.json - $(this-folder)/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json - $(this-folder)/Microsoft.Synapse/preview/2020-02-01-preview/roles.json @@ -182,11 +178,11 @@ input-file: ``` -If there are files that should not be in the `all-api-versions` set, +If there are files that should not be in the `all-api-versions` set, uncomment the `exclude-file` section below and add the file paths. ``` yaml $(tag) == 'all-api-versions' -#exclude-file: +#exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` From 5dd3665a4650263ec1c615c68e154e621ce21080 Mon Sep 17 00:00:00 2001 From: Surya Date: Thu, 16 Jul 2020 13:47:28 +0530 Subject: [PATCH 07/17] Update title to ArtifactsClient --- .../preview/2019-06-01-preview/bigDataPools.json | 2 +- .../preview/2019-06-01-preview/integrationRuntimes.json | 2 +- .../Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json | 2 +- .../Microsoft.Synapse/preview/2019-06-01-preview/workspace.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index 73e37e81f367..121705909123 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "BigDataPoolClient" + "title": "ArtifactsClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json index 93882942fd39..fb249b6860a0 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "IntegrationRuntimeClient" + "title": "ArtifactsClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index 1bf49abc34b9..679146df09fd 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "SqlPoolClient" + "title": "ArtifactsClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 9cdbff6fbbe1..6fae4e08a393 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-01-01-preview", - "title": "WorkspaceClient" + "title": "ArtifactsClient" }, "x-ms-parameterized-host": { "hostTemplate": "{endpoint}", From 2ff627af7a0d755cdb7c3dbdc7059fe7bfc8eebd Mon Sep 17 00:00:00 2001 From: Surya Date: Thu, 16 Jul 2020 14:03:57 +0530 Subject: [PATCH 08/17] Update api-version to 2019-06-01-preview --- .../preview/2019-06-01-preview/bigDataPools.json | 2 +- .../preview/2019-06-01-preview/integrationRuntimes.json | 2 +- .../Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json | 2 +- .../Microsoft.Synapse/preview/2019-06-01-preview/workspace.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index 121705909123..64a87c295647 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-01-01-preview", + "version": "2019-06-01-preview", "title": "ArtifactsClient" }, "x-ms-parameterized-host": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json index fb249b6860a0..121a2b1485ef 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-01-01-preview", + "version": "2019-06-01-preview", "title": "ArtifactsClient" }, "x-ms-parameterized-host": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index 679146df09fd..b63fb8e3ff24 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-01-01-preview", + "version": "2019-06-01-preview", "title": "ArtifactsClient" }, "x-ms-parameterized-host": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 6fae4e08a393..62196f837d06 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-01-01-preview", + "version": "2019-06-01-preview", "title": "ArtifactsClient" }, "x-ms-parameterized-host": { From 5859ed84fc1c84e0bedc6c67c1b332450fd1940f Mon Sep 17 00:00:00 2001 From: Surya Date: Wed, 22 Jul 2020 16:49:21 +0530 Subject: [PATCH 09/17] Fix CI failures --- .../2019-06-01-preview/bigDataPools.json | 2 +- .../examples/BigDataPools_Get.json | 2 +- .../examples/IntegrationRuntimes_Get.json | 2 +- .../examples/SqlPools_Get.json | 4 +- .../examples/SqlPools_List.json | 4 +- .../integrationRuntimes.json | 2 +- .../preview/2019-06-01-preview/sqlPools.json | 69 ++++++++++++++++++- 7 files changed, 75 insertions(+), 10 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index 64a87c295647..5b8e364509f4 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -63,7 +63,7 @@ "operationId": "BigDataPools_Get", "description": "Get Big Data Pool", "x-ms-examples": { - "Get Bit Data Pool": { + "Get Big Data Pool": { "$ref": "./examples/BigDataPools_Get.json" } }, diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json index 5a141789b2c4..bb692bdb57b9 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json @@ -1,7 +1,7 @@ { "parameters": { "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "BigDataPoolName" : "pool1", + "bigDataPoolName" : "pool1", "api-version": "2020-01-01-preview" }, "responses": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json index fabc12ab07b7..87a962601ae0 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json @@ -1,7 +1,7 @@ { "parameters": { "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "IntegrationRuntimeName" : "IntegrationRuntime1", + "integrationRuntimeName" : "IntegrationRuntime1", "api-version": "2020-01-01-preview" }, "responses": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json index f6eaba3cd360..eaa675531b14 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json @@ -1,7 +1,7 @@ { "parameters": { "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "SqlPoolName" : "SqlPool1", + "sqlPoolName" : "SqlPool1", "api-version": "2020-01-01-preview" }, "responses": { @@ -11,7 +11,7 @@ "status": "Online", "maxSizeBytes": 263882790666240, "collation": "SQL_Latin1_General_CP1_CI_AS", - "restorePointInTime": "0001-01-01T00:00:00", + "restorePointInTime": "2019-06-23T10:47:12.837Z", "creationDate": "2020-06-23T10:47:12.837Z", "provisioningState": "Succeeded" }, diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json index b3a38e1932ec..842bbe9d8d94 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json @@ -12,7 +12,7 @@ "status": "Online", "maxSizeBytes": 263882790666240, "collation": "SQL_Latin1_General_CP1_CI_AS", - "restorePointInTime": "0001-01-01T00:00:00", + "restorePointInTime": "2020-06-23T10:47:12.837Z", "creationDate": "2020-06-23T10:47:12.837Z", "provisioningState": "Succeeded" }, @@ -31,7 +31,7 @@ "status": "Online", "maxSizeBytes": 263882790666240, "collation": "SQL_Latin1_General_CP1_CI_AS", - "restorePointInTime": "0001-01-01T00:00:00", + "restorePointInTime": "2020-06-23T10:47:12.837Z", "creationDate": "2020-06-23T11:10:59.05Z", "provisioningState": "Succeeded" }, diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json index 121a2b1485ef..f60bfe58c076 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json @@ -84,7 +84,7 @@ "200": { "description": "Success response.", "schema": { - "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeResource" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json#/definitions/IntegrationRuntimeResource" } }, "default": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index b63fb8e3ff24..d2f5598acfcf 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -146,15 +146,80 @@ "description": "Resource tags." }, "sku": { - "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/Sku", + "$ref": "#/definitions/Sku", "description": "SQL pool SKU" }, "properties": { - "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/SqlPoolResourceProperties", + "$ref": "#/definitions/SqlPoolResourceProperties", "description": "SQL pool properties", "x-ms-client-flatten": true } } + }, + "SqlPoolResourceProperties": { + "type": "object", + "title": "SQL pool properties", + "description": "Properties of a SQL Analytics pool", + "properties": { + "maxSizeBytes": { + "type": "integer", + "description": "Maximum size in bytes", + "format": "int64" + }, + "collation": { + "type": "string", + "description": "Collation mode" + }, + "sourceDatabaseId": { + "type": "string", + "description": "Source database to create from" + }, + "recoverableDatabaseId": { + "type": "string", + "description": "Backup database to restore from" + }, + "provisioningState": { + "type": "string", + "description": "Resource state" + }, + "status": { + "type": "string", + "description": "Resource status" + }, + "restorePointInTime": { + "type": "string", + "description": "Snapshot time to restore", + "format": "date-time" + }, + "createMode": { + "type": "string", + "description": "What is this?" + }, + "creationDate": { + "type": "string", + "description": "Date the SQL pool was created", + "format": "date-time" + } + } + }, + "Sku": { + "type": "object", + "title": "Sku", + "description": "SQL pool SKU", + "properties": { + "name": { + "type": "string", + "description": "The SKU name" + }, + "tier": { + "type": "string", + "description": "The SKU name" + }, + "capacity": { + "type": "integer", + "description": "The SKU capacity" + } + } } }, "parameters": From d349a2a8918504c5d65d908393f8678cda5096f5 Mon Sep 17 00:00:00 2001 From: Surya Date: Wed, 22 Jul 2020 17:42:22 +0530 Subject: [PATCH 10/17] Fix SDK violations --- .../preview/2019-06-01-preview/bigDataPools.json | 3 ++- .../preview/2019-06-01-preview/integrationRuntimes.json | 3 ++- .../Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index 5b8e364509f4..d02c7ec1f228 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -175,7 +175,8 @@ "in": "path", "required": true, "type": "string", - "description": "The Big Data Pool name" + "description": "The Big Data Pool name", + "x-ms-parameter-location": "method" } } } \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json index f60bfe58c076..4977b2d918f6 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json @@ -121,7 +121,8 @@ "in": "path", "required": true, "type": "string", - "description": "The Integration Runtime name" + "description": "The Integration Runtime name", + "x-ms-parameter-location": "method" } } } \ No newline at end of file diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index d2f5598acfcf..254f57f454e8 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -245,7 +245,8 @@ "in": "path", "required": true, "type": "string", - "description": "The Sql Pool name" + "description": "The Sql Pool name", + "x-ms-parameter-location": "method" } } } \ No newline at end of file From 9f894e8bbe498633521bbd2959651b6292fff161 Mon Sep 17 00:00:00 2001 From: Surya Date: Wed, 22 Jul 2020 17:46:40 +0530 Subject: [PATCH 11/17] Prettier check --- .../2019-06-01-preview/bigDataPools.json | 6 +- .../examples/BigDataPools_Get.json | 76 ++++++------ .../examples/BigDataPools_List.json | 82 ++++++------- .../examples/IntegrationRuntimes_Get.json | 26 ++--- .../examples/IntegrationRuntimes_List.json | 2 +- .../examples/SqlPools_Get.json | 66 +++++------ .../examples/SqlPools_List.json | 110 +++++++++--------- .../examples/Workspace_Get.json | 82 ++++++------- .../integrationRuntimes.json | 5 +- .../preview/2019-06-01-preview/sqlPools.json | 9 +- .../preview/2019-06-01-preview/workspace.json | 74 ++++++------ 11 files changed, 268 insertions(+), 270 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index d02c7ec1f228..db08068c6386 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -98,7 +98,7 @@ } }, "definitions": { - "BigDataPoolListResponse" : { + "BigDataPoolListResponse": { "description": "A list of BigDataPools in this workspace", "type": "object", "required": [ @@ -118,7 +118,7 @@ } } }, - "BigDataPoolResponse" : { + "BigDataPoolResponse": { "description": "BigDataPool information", "type": "object", "properties": { @@ -179,4 +179,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json index bb692bdb57b9..293eb88177e1 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_Get.json @@ -1,43 +1,43 @@ { - "parameters": { - "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "bigDataPoolName" : "pool1", - "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { - "body": { - "properties": { - "creationDate": "2020-07-14T10:09:52.5133333Z", - "sparkVersion": "2.4", - "nodeCount": 3, - "nodeSize": "Small", - "nodeSizeFamily": "MemoryOptimized", - "autoScale": { - "enabled": true, - "minNodeCount": 3, - "maxNodeCount": 20 - }, - "autoPause": { - "enabled": true, - "delayInMinutes": 15 - }, - "provisioningState": "Succeeded" + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", + "bigDataPoolName": "pool1", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "creationDate": "2020-07-14T10:09:52.5133333Z", + "sparkVersion": "2.4", + "nodeCount": 3, + "nodeSize": "Small", + "nodeSizeFamily": "MemoryOptimized", + "autoScale": { + "enabled": true, + "minNodeCount": 3, + "maxNodeCount": 20 }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkComputes/pool1", - "name": "pool1", - "type": "Microsoft.Synapse/workspaces/sparkComputes", - "location": "southeastasia", - "tags": {} - } - }, - "default": { - "body": { - "error": { - "code": "Error code", - "message": "Error message" - } + "autoPause": { + "enabled": true, + "delayInMinutes": 15 + }, + "provisioningState": "Succeeded" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkComputes/pool1", + "name": "pool1", + "type": "Microsoft.Synapse/workspaces/sparkComputes", + "location": "southeastasia", + "tags": {} + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" } } } -} \ No newline at end of file + } +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_List.json index dc28ed37e9a8..9d7eb2a4b3d1 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_List.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/BigDataPools_List.json @@ -1,46 +1,46 @@ { - "parameters": { - "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "creationDate": "2020-07-14T10:09:52.5133333Z", - "sparkVersion": "2.4", - "nodeCount": 3, - "nodeSize": "Small", - "nodeSizeFamily": "MemoryOptimized", - "autoScale": { - "enabled": true, - "minNodeCount": 3, - "maxNodeCount": 20 - }, - "autoPause": { - "enabled": true, - "delayInMinutes": 15 - }, - "provisioningState": "Succeeded" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkComputes/pool1", - "name": "pool1", - "type": "Microsoft.Synapse/workspaces/sparkComputes", - "location": "southeastasia", - "tags": {} - } - ] - } - }, - "default": { - "body": { - "error": { - "code": "Error code", - "message": "Error message" + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "creationDate": "2020-07-14T10:09:52.5133333Z", + "sparkVersion": "2.4", + "nodeCount": 3, + "nodeSize": "Small", + "nodeSizeFamily": "MemoryOptimized", + "autoScale": { + "enabled": true, + "minNodeCount": 3, + "maxNodeCount": 20 + }, + "autoPause": { + "enabled": true, + "delayInMinutes": 15 + }, + "provisioningState": "Succeeded" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkComputes/pool1", + "name": "pool1", + "type": "Microsoft.Synapse/workspaces/sparkComputes", + "location": "southeastasia", + "tags": {} } + ] + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" } } } -} \ No newline at end of file + } +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json index 87a962601ae0..7c29982919bb 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_Get.json @@ -1,27 +1,27 @@ { "parameters": { "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "integrationRuntimeName" : "IntegrationRuntime1", + "integrationRuntimeName": "IntegrationRuntime1", "api-version": "2020-01-01-preview" }, "responses": { "200": { - "body" : { + "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/integrationruntimes/IntegrationRuntime1", "name": "IntegrationRuntime1", "type": "Microsoft.Synapse/workspaces/integrationruntimes", "properties": { - "type": "Managed", - "typeProperties": { - "computeProperties": { - "location": "Australia Southeast", - "dataFlowProperties": { - "computeType": "General", - "coreCount": 8, - "timeToLive": 0 - } - } + "type": "Managed", + "typeProperties": { + "computeProperties": { + "location": "Australia Southeast", + "dataFlowProperties": { + "computeType": "General", + "coreCount": 8, + "timeToLive": 0 + } } + } }, "etag": "00000000-0000-0000-0000-000000000000" } @@ -35,4 +35,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_List.json index f6939d78d9dd..fa5eba85b2b2 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_List.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/IntegrationRuntimes_List.json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json index eaa675531b14..6e3c7131bfd7 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_Get.json @@ -1,38 +1,38 @@ { - "parameters": { - "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "sqlPoolName" : "SqlPool1", - "api-version": "2020-01-01-preview" + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", + "sqlPoolName": "SqlPool1", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "status": "Online", + "maxSizeBytes": 263882790666240, + "collation": "SQL_Latin1_General_CP1_CI_AS", + "restorePointInTime": "2019-06-23T10:47:12.837Z", + "creationDate": "2020-06-23T10:47:12.837Z", + "provisioningState": "Succeeded" + }, + "sku": { + "name": "DW100c", + "capacity": 0 + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool1", + "name": "SqlPool1", + "type": "Microsoft.Synapse/workspaces/sqlPools", + "location": "southeastasia", + "tags": {} + } }, - "responses": { - "200": { - "body": { - "properties": { - "status": "Online", - "maxSizeBytes": 263882790666240, - "collation": "SQL_Latin1_General_CP1_CI_AS", - "restorePointInTime": "2019-06-23T10:47:12.837Z", - "creationDate": "2020-06-23T10:47:12.837Z", - "provisioningState": "Succeeded" - }, - "sku": { - "name": "DW100c", - "capacity": 0 - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool1", - "name": "SqlPool1", - "type": "Microsoft.Synapse/workspaces/sqlPools", - "location": "southeastasia", - "tags": {} - } - }, - "default": { - "body": { - "error": { - "code": "Error code", - "message": "Error message" - } + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" } } } -} \ No newline at end of file + } +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json index 842bbe9d8d94..b4fa21cd8385 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPools_List.json @@ -1,60 +1,60 @@ { - "parameters": { - "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "status": "Online", - "maxSizeBytes": 263882790666240, - "collation": "SQL_Latin1_General_CP1_CI_AS", - "restorePointInTime": "2020-06-23T10:47:12.837Z", - "creationDate": "2020-06-23T10:47:12.837Z", - "provisioningState": "Succeeded" - }, - "sku": { - "name": "DW100c", - "capacity": 0 - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool1", - "name": "SqlPool1", - "type": "Microsoft.Synapse/workspaces/sqlPools", - "location": "southeastasia", - "tags": {} - }, - { - "properties": { - "status": "Online", - "maxSizeBytes": 263882790666240, - "collation": "SQL_Latin1_General_CP1_CI_AS", - "restorePointInTime": "2020-06-23T10:47:12.837Z", - "creationDate": "2020-06-23T11:10:59.05Z", - "provisioningState": "Succeeded" - }, - "sku": { - "name": "DW100c", - "capacity": 0 - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool2Backup", - "name": "SqlPool2Backup", - "type": "Microsoft.Synapse/workspaces/sqlPools", - "location": "southeastasia", - "tags": {} - } - ] - } - }, - "default": { - "body": { - "error": { - "code": "Error code", - "message": "Error message" + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "status": "Online", + "maxSizeBytes": 263882790666240, + "collation": "SQL_Latin1_General_CP1_CI_AS", + "restorePointInTime": "2020-06-23T10:47:12.837Z", + "creationDate": "2020-06-23T10:47:12.837Z", + "provisioningState": "Succeeded" + }, + "sku": { + "name": "DW100c", + "capacity": 0 + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool1", + "name": "SqlPool1", + "type": "Microsoft.Synapse/workspaces/sqlPools", + "location": "southeastasia", + "tags": {} + }, + { + "properties": { + "status": "Online", + "maxSizeBytes": 263882790666240, + "collation": "SQL_Latin1_General_CP1_CI_AS", + "restorePointInTime": "2020-06-23T10:47:12.837Z", + "creationDate": "2020-06-23T11:10:59.05Z", + "provisioningState": "Succeeded" + }, + "sku": { + "name": "DW100c", + "capacity": 0 + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sqlPools/SqlPool2Backup", + "name": "SqlPool2Backup", + "type": "Microsoft.Synapse/workspaces/sqlPools", + "location": "southeastasia", + "tags": {} } + ] + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" } } } -} \ No newline at end of file + } +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/Workspace_Get.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/Workspace_Get.json index d9887abfd3c7..24d30b931091 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/Workspace_Get.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/Workspace_Get.json @@ -1,46 +1,46 @@ { - "parameters": { - "endpoint": "exampleWorkspace.dev.azuresynapse.net", - "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace", - "location": "southeastasia", - "name": "exampleWorkspace", - "type": "Microsoft.Synapse/workspaces", - "identity": { - "type": "SystemAssigned", - "principalId": "00000000-0000-0000-0000-000000000000", - "tenantId": "00000000-0000-0000-0000-000000000000" - }, - "tags": {}, - "properties": { - "connectivityEndpoints": { - "web": "https://web.azuresynapse.net?workspace=%2fsubscriptions%2f00000000-0000-0000-0000-000000000000%2fresourceGroups%2frg%2fproviders%2fMicrosoft.Synapse%2fworkspaces%2fexampleWorkspace", - "sql": "exampleWorkspace.sql.azuresynapse.net", - "dev": "https://exampleWorkspace.dev.azuresynapse.net", - "sqlOnDemand": "exampleWorkspace-ondemand.sql.azuresynapse.net" - }, - "managedResourceGroupName": "workspacemanagedrg-1a992746-f580-4fce-a696-b0373bc6959a", - "defaultDataLakeStorage": { - "accountUrl": "https://exampleWorkspacedfs.dfs.core.windows.net", - "filesystem": "synapse" - }, - "sqlAdministratorLogin": "sqladminuser", - "privateEndpointConnections": [], - "provisioningState": "Succeeded" - } + "parameters": { + "endpoint": "exampleWorkspace.dev.azuresynapse.net", + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Synapse/workspaces/exampleWorkspace", + "location": "southeastasia", + "name": "exampleWorkspace", + "type": "Microsoft.Synapse/workspaces", + "identity": { + "type": "SystemAssigned", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000" + }, + "tags": {}, + "properties": { + "connectivityEndpoints": { + "web": "https://web.azuresynapse.net?workspace=%2fsubscriptions%2f00000000-0000-0000-0000-000000000000%2fresourceGroups%2frg%2fproviders%2fMicrosoft.Synapse%2fworkspaces%2fexampleWorkspace", + "sql": "exampleWorkspace.sql.azuresynapse.net", + "dev": "https://exampleWorkspace.dev.azuresynapse.net", + "sqlOnDemand": "exampleWorkspace-ondemand.sql.azuresynapse.net" + }, + "managedResourceGroupName": "workspacemanagedrg-1a992746-f580-4fce-a696-b0373bc6959a", + "defaultDataLakeStorage": { + "accountUrl": "https://exampleWorkspacedfs.dfs.core.windows.net", + "filesystem": "synapse" + }, + "sqlAdministratorLogin": "sqladminuser", + "privateEndpointConnections": [], + "provisioningState": "Succeeded" } - }, - "default": { - "body": { - "error": { - "code": "Error code", - "message": "Error message" - } + } + }, + "default": { + "body": { + "error": { + "code": "Error code", + "message": "Error message" } } } -} \ No newline at end of file + } +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json index 4977b2d918f6..f2ebc2acba32 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json @@ -97,8 +97,7 @@ } } }, - "definitions": { - }, + "definitions": {}, "parameters": { "ApiVersionParameter": { "name": "api-version", @@ -125,4 +124,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index 254f57f454e8..57a088e7c663 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -98,7 +98,7 @@ } }, "definitions": { - "SqlPoolListResponse" : { + "SqlPoolListResponse": { "description": "A list of SqlPools in this workspace", "type": "object", "required": [ @@ -118,7 +118,7 @@ } } }, - "SqlPoolResponse" : { + "SqlPoolResponse": { "description": "SqlPool information", "type": "object", "properties": { @@ -222,8 +222,7 @@ } } }, - "parameters": - { + "parameters": { "ApiVersionParameter": { "name": "api-version", "in": "query", @@ -249,4 +248,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 62196f837d06..fdea36616f0b 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -17,44 +17,44 @@ "https" ], "paths": { - "/workspace": { - "get": { - "tags": [ - "Workspace" - ], - "operationId": "Workspace_Get", - "description": "Get Workspace", - "x-ms-examples": { - "Get Workspace Information": { - "$ref": "./examples/Workspace_Get.json" + "/workspace": { + "get": { + "tags": [ + "Workspace" + ], + "operationId": "Workspace_Get", + "description": "Get Workspace", + "x-ms-examples": { + "Get Workspace Information": { + "$ref": "./examples/Workspace_Get.json" + } + }, + "consumes": [], + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success response.", + "schema": { + "$ref": "#/definitions/WorkspaceResponse" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Success response.", - "schema": { - "$ref": "#/definitions/WorkspaceResponse" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorContract" - } + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorContract" } } } } + } }, "definitions": { "WorkspaceResponse": { @@ -84,13 +84,13 @@ }, "description": "Resource tags." }, - "identity":{ + "identity": { "description": "Workspace MSI information", - "$ref" : "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ManagedIdentity" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ManagedIdentity" }, - "properties":{ + "properties": { "description": "Workspace Properties", - "$ref" : "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/WorkspaceProperties", + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/WorkspaceProperties", "x-ms-client-flatten": true } } @@ -167,4 +167,4 @@ "x-ms-parameter-location": "client" } } -} \ No newline at end of file +} From fb32c0bacc98fac3710b9353c2d59bf27c6c40ea Mon Sep 17 00:00:00 2001 From: Surya Date: Wed, 22 Jul 2020 18:15:00 +0530 Subject: [PATCH 12/17] Fix LintDiff errors --- .../2019-06-01-preview/bigDataPools.json | 24 +++++++++++++------ .../preview/2019-06-01-preview/sqlPools.json | 24 +++++++++++++------ .../preview/2019-06-01-preview/workspace.json | 24 +++++++++++++------ 3 files changed, 51 insertions(+), 21 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index db08068c6386..79192fff1af1 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -123,28 +123,38 @@ "type": "object", "properties": { "id": { + "readOnly": true, "type": "string", - "description": "ARM Resource ID of the BigDataPool" - }, - "location": { - "type": "string", - "description": "Big Data Pool Location" + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, "name": { + "readOnly": true, "type": "string", - "description": "Big Data Pool Name" + "description": "The name of the resource" }, "type": { + "readOnly": true, "type": "string", - "description": "Resource type" + "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." }, "tags": { "type": "object", "additionalProperties": { "type": "string" }, + "x-ms-mutability": [ + "read" + ], "description": "Resource tags." }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives" + }, "properties": { "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceProperties", "description": "Big Data pool properties", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index 57a088e7c663..556f5d98e4d7 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -123,28 +123,38 @@ "type": "object", "properties": { "id": { + "readOnly": true, "type": "string", - "description": "ARM Resource ID of the SqlPool" - }, - "location": { - "type": "string", - "description": "Sql Pool Location" + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, "name": { + "readOnly": true, "type": "string", - "description": "Sql Pool Name" + "description": "The name of the resource" }, "type": { + "readOnly": true, "type": "string", - "description": "Resource type" + "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." }, "tags": { "type": "object", "additionalProperties": { "type": "string" }, + "x-ms-mutability": [ + "read" + ], "description": "Resource tags." }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives" + }, "sku": { "$ref": "#/definitions/Sku", "description": "SQL pool SKU" diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index fdea36616f0b..ebee240d87d1 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -62,28 +62,38 @@ "type": "object", "properties": { "id": { + "readOnly": true, "type": "string", - "description": "ARM Resource ID of the Workspace" - }, - "location": { - "type": "string", - "description": "Workspace Location" + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, "name": { + "readOnly": true, "type": "string", - "description": "Workspace Name" + "description": "The name of the resource" }, "type": { + "readOnly": true, "type": "string", - "description": "Resource type" + "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." }, "tags": { "type": "object", "additionalProperties": { "type": "string" }, + "x-ms-mutability": [ + "read" + ], "description": "Resource tags." }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives" + }, "identity": { "description": "Workspace MSI information", "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ManagedIdentity" From c4f00d96ae4fff8dc0ac396116b01979a6ecb2e9 Mon Sep 17 00:00:00 2001 From: Surya Date: Wed, 22 Jul 2020 18:33:56 +0530 Subject: [PATCH 13/17] Fix Lintdiff --- .../preview/2019-06-01-preview/bigDataPools.json | 9 ++------- .../preview/2019-06-01-preview/sqlPools.json | 9 ++------- .../preview/2019-06-01-preview/workspace.json | 9 ++------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index 79192fff1af1..820aa8305753 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -138,21 +138,16 @@ "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." }, "tags": { + "readOnly": true, "type": "object", "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read" - ], "description": "Resource tags." }, "location": { + "readOnly": true, "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], "description": "The geo-location where the resource lives" }, "properties": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index 556f5d98e4d7..71fd9a663fdb 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -138,21 +138,16 @@ "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." }, "tags": { + "readOnly": true, "type": "object", "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read" - ], "description": "Resource tags." }, "location": { + "readOnly": true, "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], "description": "The geo-location where the resource lives" }, "sku": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index ebee240d87d1..384e97f8f83e 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -77,21 +77,16 @@ "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." }, "tags": { + "readOnly": true, "type": "object", "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read" - ], "description": "Resource tags." }, "location": { + "readOnly": true, "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], "description": "The geo-location where the resource lives" }, "identity": { From fd50af4959d72532d13935725a28c44de1c6c9e9 Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Mon, 17 Aug 2020 05:24:27 -0700 Subject: [PATCH 14/17] Update Read API swagger specs --- .../preview/2019-06-01-preview/artifacts.json | 117 +------------ .../2019-06-01-preview/bigDataPools.json | 86 ++-------- .../integrationRuntimes.json | 20 +-- .../preview/2019-06-01-preview/sqlPools.json | 155 ++---------------- .../preview/2019-06-01-preview/workspace.json | 114 +------------ specification/synapse/data-plane/readme.md | 1 - .../integrationRuntime.json | 28 +--- 7 files changed, 48 insertions(+), 473 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json index 4a768103cef3..7e274fe4e49f 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json @@ -2301,70 +2301,13 @@ } }, "definitions": { - "Resource": { - "description": "Azure Synapse top-level resource.", - "properties": { - "id": { - "type": "string", - "description": "The resource identifier.", - "readOnly": true - }, - "name": { - "type": "string", - "description": "The resource name.", - "readOnly": true - }, - "type": { - "type": "string", - "description": "The resource type.", - "readOnly": true - }, - "location": { - "type": "string", - "description": "The resource location.", - "x-ms-mutability": [ - "create", - "read" - ] - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "The resource tags." - }, - "eTag": { - "type": "string", - "description": "Etag identifies change in the resource.", - "readOnly": true - } - } - }, "SubResource": { "description": "Azure Synapse nested resource, which belongs to a workspace.", - "properties": { - "id": { - "type": "string", - "description": "The resource identifier.", - "readOnly": true - }, - "name": { - "type": "string", - "description": "The resource name.", - "readOnly": true - }, - "type": { - "type": "string", - "description": "The resource type.", - "readOnly": true - }, - "etag": { - "type": "string", - "description": "Etag identifies change in the resource.", - "readOnly": true + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/AzureEntityResource" } - } + ] }, "SubResourceDebugResource": { "description": "Azure Synapse nested debug resource.", @@ -3139,29 +3082,6 @@ } } }, - "Workspace": { - "description": "Workspace resource type.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "identity": { - "$ref": "#/definitions/WorkspaceIdentity", - "description": "Managed service identity of the workspace." - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/WorkspaceProperties", - "description": "Properties of the workspace." - } - }, - "additionalProperties": { - "type": "object" - } - }, "WorkspaceUpdateParameters": { "description": "Parameters for updating a workspace resource.", "properties": { @@ -3207,35 +3127,6 @@ "type" ] }, - "WorkspaceProperties": { - "description": "Workspace resource properties.", - "properties": { - "provisioningState": { - "description": "Workspace provisioning state, example Succeeded.", - "type": "string", - "readOnly": true - }, - "createTime": { - "description": "Time the workspace was created in ISO8601 format.", - "type": "string", - "readOnly": true, - "format": "date-time" - }, - "version": { - "description": "Version of the workspace.", - "type": "string", - "readOnly": true - }, - "defaultStorage": { - "description": "Linked service reference.", - "$ref": "#/definitions/LinkedServiceReference" - }, - "defaultSqlServer": { - "description": "Linked service reference.", - "$ref": "#/definitions/LinkedServiceReference" - } - } - }, "DatasetReference": { "description": "Dataset reference type.", "properties": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json index 820aa8305753..591263062dbd 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json @@ -16,6 +16,12 @@ "schemes": [ "https" ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "paths": { "/bigDataPools": { "get": { @@ -29,11 +35,6 @@ "$ref": "./examples/BigDataPools_List.json" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -43,13 +44,13 @@ "200": { "description": "Success response.", "schema": { - "$ref": "#/definitions/BigDataPoolListResponse" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceInfoListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./workspace.json#/definitions/ErrorContract" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ErrorContract" } } } @@ -67,11 +68,6 @@ "$ref": "./examples/BigDataPools_Get.json" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -84,80 +80,20 @@ "200": { "description": "Success response.", "schema": { - "$ref": "#/definitions/BigDataPoolResponse" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceInfo" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./workspace.json#/definitions/ErrorContract" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ErrorContract" } } } } } }, - "definitions": { - "BigDataPoolListResponse": { - "description": "A list of BigDataPools in this workspace", - "type": "object", - "required": [ - "value" - ], - "properties": { - "value": { - "type": "array", - "description": "List of Big Data Pools", - "items": { - "$ref": "#/definitions/BigDataPoolResponse" - } - }, - "nextLink": { - "description": "The link to the next page of results, if any remaining results exist.", - "type": "string" - } - } - }, - "BigDataPoolResponse": { - "description": "BigDataPool information", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." - }, - "tags": { - "readOnly": true, - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags." - }, - "location": { - "readOnly": true, - "type": "string", - "description": "The geo-location where the resource lives" - }, - "properties": { - "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/bigDataPool.json#/definitions/BigDataPoolResourceProperties", - "description": "Big Data pool properties", - "x-ms-client-flatten": true - } - } - } - }, + "definitions": {}, "parameters": { "ApiVersionParameter": { "name": "api-version", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json index f2ebc2acba32..3a67a10647a4 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntimes.json @@ -16,6 +16,12 @@ "schemes": [ "https" ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "paths": { "/integrationRuntimes": { "get": { @@ -29,11 +35,6 @@ "$ref": "./examples/IntegrationRuntimes_List.json" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -49,7 +50,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./workspace.json#/definitions/ErrorContract" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ErrorContract" } } } @@ -67,11 +68,6 @@ "$ref": "./examples/IntegrationRuntimes_Get.json" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -90,7 +86,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./workspace.json#/definitions/ErrorContract" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ErrorContract" } } } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json index 71fd9a663fdb..5d1960a0c9c3 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json @@ -16,6 +16,12 @@ "schemes": [ "https" ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "paths": { "/sqlPools": { "get": { @@ -29,11 +35,6 @@ "$ref": "./examples/SqlPools_List.json" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -43,13 +44,13 @@ "200": { "description": "Success response.", "schema": { - "$ref": "#/definitions/SqlPoolListResponse" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/SqlPoolInfoListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./workspace.json#/definitions/ErrorContract" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ErrorContract" } } } @@ -67,11 +68,6 @@ "$ref": "./examples/SqlPools_Get.json" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -84,149 +80,20 @@ "200": { "description": "Success response.", "schema": { - "$ref": "#/definitions/SqlPoolResponse" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json#/definitions/SqlPool" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./workspace.json#/definitions/ErrorContract" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ErrorContract" } } } } } }, - "definitions": { - "SqlPoolListResponse": { - "description": "A list of SqlPools in this workspace", - "type": "object", - "required": [ - "value" - ], - "properties": { - "value": { - "type": "array", - "description": "List of Sql Pools", - "items": { - "$ref": "#/definitions/SqlPoolResponse" - } - }, - "nextLink": { - "description": "The link to the next page of results, if any remaining results exist.", - "type": "string" - } - } - }, - "SqlPoolResponse": { - "description": "SqlPool information", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." - }, - "tags": { - "readOnly": true, - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags." - }, - "location": { - "readOnly": true, - "type": "string", - "description": "The geo-location where the resource lives" - }, - "sku": { - "$ref": "#/definitions/Sku", - "description": "SQL pool SKU" - }, - "properties": { - "$ref": "#/definitions/SqlPoolResourceProperties", - "description": "SQL pool properties", - "x-ms-client-flatten": true - } - } - }, - "SqlPoolResourceProperties": { - "type": "object", - "title": "SQL pool properties", - "description": "Properties of a SQL Analytics pool", - "properties": { - "maxSizeBytes": { - "type": "integer", - "description": "Maximum size in bytes", - "format": "int64" - }, - "collation": { - "type": "string", - "description": "Collation mode" - }, - "sourceDatabaseId": { - "type": "string", - "description": "Source database to create from" - }, - "recoverableDatabaseId": { - "type": "string", - "description": "Backup database to restore from" - }, - "provisioningState": { - "type": "string", - "description": "Resource state" - }, - "status": { - "type": "string", - "description": "Resource status" - }, - "restorePointInTime": { - "type": "string", - "description": "Snapshot time to restore", - "format": "date-time" - }, - "createMode": { - "type": "string", - "description": "What is this?" - }, - "creationDate": { - "type": "string", - "description": "Date the SQL pool was created", - "format": "date-time" - } - } - }, - "Sku": { - "type": "object", - "title": "Sku", - "description": "SQL pool SKU", - "properties": { - "name": { - "type": "string", - "description": "The SKU name" - }, - "tier": { - "type": "string", - "description": "The SKU name" - }, - "capacity": { - "type": "integer", - "description": "The SKU capacity" - } - } - } - }, + "definitions": {}, "parameters": { "ApiVersionParameter": { "name": "api-version", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 384e97f8f83e..a32938e1bd26 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -16,6 +16,12 @@ "schemes": [ "https" ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "paths": { "/workspace": { "get": { @@ -29,11 +35,6 @@ "$ref": "./examples/Workspace_Get.json" } }, - "consumes": [], - "produces": [ - "application/json", - "text/json" - ], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -43,117 +44,20 @@ "200": { "description": "Success response.", "schema": { - "$ref": "#/definitions/WorkspaceResponse" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/Workspace" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorContract" + "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ErrorContract" } } } } } }, - "definitions": { - "WorkspaceResponse": { - "description": "Workspace information", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." - }, - "tags": { - "readOnly": true, - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags." - }, - "location": { - "readOnly": true, - "type": "string", - "description": "The geo-location where the resource lives" - }, - "identity": { - "description": "Workspace MSI information", - "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/ManagedIdentity" - }, - "properties": { - "description": "Workspace Properties", - "$ref": "../../../../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json#/definitions/WorkspaceProperties", - "x-ms-client-flatten": true - } - } - }, - "ErrorContract": { - "title": "Error details.", - "description": "Contains details when the response code indicates an error.", - "type": "object", - "properties": { - "error": { - "description": "The error details.", - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "ErrorResponse": { - "required": [ - "code", - "message" - ], - "type": "object", - "properties": { - "code": { - "type": "string" - }, - "message": { - "type": "string" - }, - "target": { - "type": "string" - }, - "details": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDetail" - } - } - } - }, - "ErrorDetail": { - "required": [ - "code", - "message" - ], - "type": "object", - "properties": { - "code": { - "type": "string" - }, - "message": { - "type": "string" - }, - "target": { - "type": "string" - } - } - } - }, + "definitions": {}, "parameters": { "ApiVersionParameter": { "name": "api-version", diff --git a/specification/synapse/data-plane/readme.md b/specification/synapse/data-plane/readme.md index 42c66982590e..1f85b7af28b9 100644 --- a/specification/synapse/data-plane/readme.md +++ b/specification/synapse/data-plane/readme.md @@ -62,7 +62,6 @@ These settings apply only when `--tag=package-artifacts-2019-06-01-preview` is s ``` yaml $(tag) == 'package-artifacts-2019-06-01-preview' input-file: -- Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json - Microsoft.Synapse/preview/2019-06-01-preview/workspace.json - Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json - Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json index 24cebc6fdb62..b5a21da45644 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json @@ -1166,30 +1166,12 @@ }, "definitions": { "SubResource": { - "description": "Azure Synapse nested resource, which belongs to a factory.", - "properties": { - "id": { - "type": "string", - "description": "The resource identifier.", - "readOnly": true - }, - "name": { - "type": "string", - "description": "The resource name.", - "readOnly": true - }, - "type": { - "type": "string", - "description": "The resource type.", - "readOnly": true - }, - "etag": { - "type": "string", - "description": "Etag identifies change in the resource.", - "readOnly": true + "description": "Azure Synapse nested resource, which belongs to a workspace.", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/AzureEntityResource" } - }, - "x-ms-azure-resource": true + ] }, "IntegrationRuntime": { "description": "Azure Synapse nested object which serves as a compute resource for activities.", From 23247c9c266aa2c8aa58cdc634b1e4e5540411c0 Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Mon, 17 Aug 2020 22:15:04 -0700 Subject: [PATCH 15/17] Update configuration file --- specification/synapse/data-plane/readme.md | 1 + .../synapse/data-plane/readme.typescript.md | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/specification/synapse/data-plane/readme.md b/specification/synapse/data-plane/readme.md index 1f85b7af28b9..42c66982590e 100644 --- a/specification/synapse/data-plane/readme.md +++ b/specification/synapse/data-plane/readme.md @@ -62,6 +62,7 @@ These settings apply only when `--tag=package-artifacts-2019-06-01-preview` is s ``` yaml $(tag) == 'package-artifacts-2019-06-01-preview' input-file: +- Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json - Microsoft.Synapse/preview/2019-06-01-preview/workspace.json - Microsoft.Synapse/preview/2019-06-01-preview/sqlPools.json - Microsoft.Synapse/preview/2019-06-01-preview/bigDataPools.json diff --git a/specification/synapse/data-plane/readme.typescript.md b/specification/synapse/data-plane/readme.typescript.md index 18d1166a5c6d..56317deac711 100644 --- a/specification/synapse/data-plane/readme.typescript.md +++ b/specification/synapse/data-plane/readme.typescript.md @@ -6,11 +6,18 @@ Please also specify `--typescript-sdks-folder= Date: Mon, 17 Aug 2020 23:40:28 -0700 Subject: [PATCH 16/17] Add capacity to SQL pool --- .../preview/2019-06-01-preview/sqlPool.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index 5d40707bd2ae..70239f3bbc09 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -2968,6 +2968,12 @@ "name": { "type": "string", "description": "The SKU name" + }, + "capacity": { + "type": "number", + "description": "The SKU capacity", + "format": "int32", + "readOnly": true } } }, From 072f97513a51c46192686634feb2d3ab24d938b1 Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Mon, 17 Aug 2020 23:58:42 -0700 Subject: [PATCH 17/17] Update capacity definition --- .../preview/2019-06-01-preview/sqlPool.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index 70239f3bbc09..554a90fdbe1f 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -2970,10 +2970,9 @@ "description": "The SKU name" }, "capacity": { - "type": "number", - "description": "The SKU capacity", + "type": "integer", "format": "int32", - "readOnly": true + "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." } } },