From fa184e5e2ffd1abd1cab37811730ecfae9ed2542 Mon Sep 17 00:00:00 2001 From: xccc-msft Date: Sat, 10 Oct 2020 13:47:08 +0800 Subject: [PATCH] LogAnalytics: update readme and fix conflicts by autorest.java --- .../preview/2019-08-01-preview/Clusters.json | 6 +++--- .../preview/2019-08-01-preview/LinkedServices.json | 6 +++--- .../2019-08-01-preview/OperationalInsights.json | 10 +++++----- .../resource-manager/readme.java.md | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/Clusters.json b/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/Clusters.json index 197cfe9edba2..e19b66293ffc 100644 --- a/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/Clusters.json +++ b/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/Clusters.json @@ -574,14 +574,14 @@ "in": "path", "required": true, "type": "string", - "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + "description": "The workspace's resource subscription ID." }, "ApiVersionParameter": { "name": "api-version", "in": "query", "required": true, "type": "string", - "description": "Client Api Version." + "description": "The client API version." }, "ResourceGroupNameParameter": { "name": "resourceGroupName", @@ -589,7 +589,7 @@ "required": true, "type": "string", "x-ms-parameter-location": "method", - "description": "The name of the resource group to get. The name is case insensitive.", + "description": "The workspace's resource group name.", "pattern": "^[-\\w\\._\\(\\)]+$", "minLength": 1, "maxLength": 90 diff --git a/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/LinkedServices.json b/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/LinkedServices.json index 745bc549f03b..f1d1b037f329 100644 --- a/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/LinkedServices.json +++ b/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/LinkedServices.json @@ -302,14 +302,14 @@ "in": "path", "required": true, "type": "string", - "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + "description": "The workspace's resource subscription ID." }, "ApiVersionParameter": { "name": "api-version", "in": "query", "required": true, "type": "string", - "description": "Client Api Version." + "description": "The client API version." }, "ResourceGroupNameParameter": { "name": "resourceGroupName", @@ -317,7 +317,7 @@ "required": true, "type": "string", "x-ms-parameter-location": "method", - "description": "The name of the resource group to get. The name is case insensitive.", + "description": "The workspace's resource group name.", "pattern": "^[-\\w\\._\\(\\)]+$", "minLength": 1, "maxLength": 90 diff --git a/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/OperationalInsights.json b/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/OperationalInsights.json index 2a01a76827ae..d502da1649f2 100644 --- a/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/OperationalInsights.json +++ b/specification/operationalinsights/resource-manager/Microsoft.OperationalInsights/preview/2019-08-01-preview/OperationalInsights.json @@ -278,7 +278,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/LinkedStorageAccounts" + "$ref": "#/definitions/LinkedStorageAccountList" }, "description": "The parameters required to create or update linked storage accounts." }, @@ -293,7 +293,7 @@ "200": { "description": "OK response definition.", "schema": { - "$ref": "#/definitions/LinkedStorageAccounts" + "$ref": "#/definitions/LinkedStorageAccountList" } } } @@ -372,7 +372,7 @@ "200": { "description": "OK response definition.", "schema": { - "$ref": "#/definitions/LinkedStorageAccounts" + "$ref": "#/definitions/LinkedStorageAccountList" } } } @@ -599,7 +599,7 @@ } } }, - "LinkedStorageAccounts": { + "LinkedStorageAccountList": { "properties": { "properties": { "x-ms-client-flatten": true, @@ -623,7 +623,7 @@ "value": { "type": "array", "items": { - "$ref": "#/definitions/LinkedStorageAccounts" + "$ref": "#/definitions/LinkedStorageAccountList" }, "description": "A list of linked storage accounts instances." } diff --git a/specification/operationalinsights/resource-manager/readme.java.md b/specification/operationalinsights/resource-manager/readme.java.md index 92bb1e7a2c03..688aafef49ac 100644 --- a/specification/operationalinsights/resource-manager/readme.java.md +++ b/specification/operationalinsights/resource-manager/readme.java.md @@ -26,6 +26,7 @@ directive: batch: - tag: package-2015-03 - tag: package-2015-11-preview + - tag: package-2019-08-preview - tag: package-2020-03-preview - tag: package-2020-08 ``` @@ -56,6 +57,19 @@ regenerate-manager: true generate-interface: true ``` +### Tag: package-2019-08-preview and java + +These settings apply only when `--tag=package-2019-08-preview --java` is specified on the command line. +Please also specify `--azure-libraries-for-java=`. + +``` yaml $(tag) == 'package-2019-08-preview' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.loganalytics.v2019_08_01_preview + output-folder: $(azure-libraries-for-java-folder)/sdk/loganalytics/mgmt-v2019_08_01_preview +regenerate-manager: true +generate-interface: true +``` + ### Tag: package-2015-03 and java These settings apply only when `--tag=package-2015-03 --java` is specified on the command line.