From a97e492f11734baa21eb9fd1f105886162e1e746 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 15:27:36 -0600 Subject: [PATCH 01/12] fix OBJECT_ADDITIONAL_PROPERTIES identified in operation "Operations_List" --- .../2020-03-20/examples/Operations_List.json | 530 +++++++++++++++++- .../stable/2020-03-20/vmware.json | 146 +++++ 2 files changed, 662 insertions(+), 14 deletions(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json index 36fea5ade871..3c4216606136 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json @@ -4,19 +4,521 @@ }, "responses": { "200": { - "body": [ - { - "display": { - "description": "Creates a private cloud", - "operation": "Create Private Cloud", - "provider": "Azure VMware Solution", - "resource": "Private Cloud" - }, - "name": "Microsoft.AVS/privateClouds/create", - "origin": "user,system" - } - ], - "nextLink": "string" + "headers": {}, + "body": { + "value": [ + { + "display": { + "description": "Lists operations available on Microsoft.AVS resource provider.", + "operation": "List available Microsoft.AVS operations", + "provider": "Microsoft.AVS", + "resource": "operations" + }, + "isDataAction": false, + "name": "Microsoft.AVS/operations/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Register Subscription for Microsoft.AVS resource provider.", + "operation": "Register Subscription for Microsoft.AVS", + "provider": "Microsoft.AVS", + "resource": "" + }, + "isDataAction": false, + "name": "Microsoft.AVS/register/action", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Unregister Subscription for Microsoft.AVS resource provider.", + "operation": "Unregister Subscription for Microsoft.AVS", + "provider": "Microsoft.AVS", + "resource": "" + }, + "isDataAction": false, + "name": "Microsoft.AVS/unregister/action", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Checks if the privateCloud Name is available", + "operation": "Check Name Availability", + "provider": "Microsoft.AVS", + "resource": "checkNameAvailability" + }, + "isDataAction": false, + "name": "Microsoft.AVS/checkNameAvailability/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Checks if the privateCloud Name is available", + "operation": "Check Name Availability", + "provider": "Microsoft.AVS", + "resource": "locations/checkNameAvailability" + }, + "isDataAction": false, + "name": "Microsoft.AVS/locations/checkNameAvailability/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Checks if quota is available for the subscription", + "operation": "Check Quota Availability", + "provider": "Microsoft.AVS", + "resource": "locations/checkQuotaAvailability" + }, + "isDataAction": false, + "name": "Microsoft.AVS/locations/checkQuotaAvailability/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Checks if trial is available for the subscription", + "operation": "Check Trial Availability", + "provider": "Microsoft.AVS", + "resource": "locations/checkTrialAvailability" + }, + "isDataAction": false, + "name": "Microsoft.AVS/locations/checkTrialAvailability/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Registers the Microsoft Microsoft.AVS resource provider and enables creation of Private Clouds.", + "operation": "Register Microsoft.AVS resource provider.", + "provider": "Microsoft.AVS", + "resource": "privateClouds" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/register/action", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Creates or updates a PrivateCloud resource.", + "operation": "Create or update a PrivateCloud.", + "provider": "Microsoft.AVS", + "resource": "privateClouds" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/write", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Gets the settings for the specified PrivateCloud.", + "operation": "Read PrivateCloud settings", + "provider": "Microsoft.AVS", + "resource": "privateClouds" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Delete a specific PrivateCloud.", + "operation": "Delete a PrivateCloud.", + "provider": "Microsoft.AVS", + "resource": "privateClouds" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/delete", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Reads privateClouds operationstatuses.", + "operation": "Read privateClouds operationstatuses", + "provider": "Microsoft.AVS", + "resource": "privateClouds/operationstatuses" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/operationstatuses/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Gets the cluster settings for a PrivateCloud cluster.", + "operation": "Read Cluster settings.", + "provider": "Microsoft.AVS", + "resource": "privateClouds/clusters" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/clusters/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Create or update a PrivateCloud cluster resource.", + "operation": "Create or update a PrivateCloud cluster.", + "provider": "Microsoft.AVS", + "resource": "privateClouds/clusters" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/clusters/write", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Delete a specific PrivateCloud cluster.", + "operation": "Delete a PriveCloud cluster.", + "provider": "Microsoft.AVS", + "resource": "privateClouds/clusters" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/clusters/delete", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Reads privateClouds/clusters operationstatuses.", + "operation": "Read privateClouds/clusters operationstatuses", + "provider": "Microsoft.AVS", + "resource": "privateClouds/clusters/operationstatuses" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/clusters/operationstatuses/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Reads privateClouds/clusters operationresults.", + "operation": "Read privateClouds/clusters operationresults", + "provider": "Microsoft.AVS", + "resource": "privateclouds/clusters/operationresults" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateclouds/clusters/operationresults/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Reads privateClouds operationresults.", + "operation": "Read privateClouds operationresults", + "provider": "Microsoft.AVS", + "resource": "privateClouds/operationresults" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/operationresults/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Gets the authorization settings for a PrivateCloud cluster.", + "operation": "Read Authorization settings.", + "provider": "Microsoft.AVS", + "resource": "privateClouds/authorizations" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/authorizations/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Create or update a PrivateCloud authorization resource.", + "operation": "Create or update a PrivateCloud authorization.", + "provider": "Microsoft.AVS", + "resource": "privateClouds/authorizations" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/authorizations/write", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Delete a specific PrivateCloud authorization.", + "operation": "Delete a PriveCloud authorization.", + "provider": "Microsoft.AVS", + "resource": "privateClouds/authorizations" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/authorizations/delete", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Lists the AdminCredentials for privateClouds.", + "operation": "List privateClouds AdminCredentials", + "provider": "Microsoft.AVS", + "resource": "privateClouds" + }, + "isDataAction": true, + "name": "Microsoft.AVS/privateClouds/listAdminCredentials/action", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Gets the hcxEnterpriseSites for a PrivateCloud.", + "operation": "Read hcxEnterpriseSites", + "provider": "Microsoft.AVS", + "resource": "privateClouds/hcxEnterpriseSites" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/hcxEnterpriseSites/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Create or update a hcxEnterpriseSites.", + "operation": "Create or update a hcxEnterpriseSites", + "provider": "Microsoft.AVS", + "resource": "privateClouds/hcxEnterpriseSites" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/hcxEnterpriseSites/write", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Delete a specific hcxEnterpriseSites.", + "operation": "Delete a hcxEnterpriseSites", + "provider": "Microsoft.AVS", + "resource": "privateClouds/hcxEnterpriseSites" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/hcxEnterpriseSites/delete", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Gets the hostInstances for a PrivateCloud.", + "operation": "Read hostInstances", + "provider": "Microsoft.AVS", + "resource": "privateClouds/hostInstances" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/hostInstances/read", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Create or update a hostInstances.", + "operation": "Create or update a hostInstances", + "provider": "Microsoft.AVS", + "resource": "privateClouds/hostInstances" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/hostInstances/write", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Delete a specific hostInstances.", + "operation": "Delete a hostInstances", + "provider": "Microsoft.AVS", + "resource": "privateClouds/hostInstances" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/hostInstances/delete", + "origin": "user,system", + "properties": {} + }, + { + "display": { + "description": "Gets the available metrics for Private Cloud", + "operation": "Read Private Cloud metric definitions", + "provider": "Microsoft Azure Dedicated", + "resource": "privateClouds" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/providers/Microsoft.Insights/metricDefinitions/read", + "origin": "system", + "properties": { + "serviceSpecification": { + "metricSpecifications": [ + { + "aggregationType": "Average", + "displayDescription": "The total amount of disk used in SDDC", + "displayName": "Datastore disk used", + "enableRegionalMdmAccount": "true", + "name": "UsedLatest", + "sourceMdmAccount": "AVSShoebox2", + "sourceMdmNamespace": "Vsphere.Datastore.Disk", + "supportedTimeGrainTypes": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "unit": "Bytes" + }, + { + "aggregationType": "Average", + "displayDescription": "The total capacity of disk in SDDC", + "displayName": "Datastore disk total capacity", + "enableRegionalMdmAccount": "true", + "name": "CapacityLatest", + "sourceMdmAccount": "AVSShoebox2", + "sourceMdmNamespace": "Vsphere.Datastore.Disk", + "supportedTimeGrainTypes": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "unit": "Bytes" + }, + { + "aggregationType": "Average", + "displayDescription": "Total amount of machine memory in cluster that is available", + "displayName": "Average Effective Memory", + "enableRegionalMdmAccount": "true", + "name": "EffectiveMemAverage", + "sourceMdmAccount": "AVSShoebox2", + "sourceMdmNamespace": "Vsphere.Cluster.ClusterServices", + "supportedTimeGrainTypes": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "unit": "Bytes" + }, + { + "aggregationType": "Average", + "displayDescription": "Total memory in cluster", + "displayName": "Average Total Memory", + "enableRegionalMdmAccount": "true", + "name": "TotalMbAverage", + "sourceMdmAccount": "AVSShoebox2", + "sourceMdmNamespace": "Vsphere.Cluster.Mem", + "supportedTimeGrainTypes": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "unit": "Bytes" + }, + { + "aggregationType": "Average", + "displayDescription": "Host physical memory consumed by the virtualization infrastructure", + "displayName": "Average Memory Overhead", + "enableRegionalMdmAccount": "true", + "name": "OverheadAverage", + "sourceMdmAccount": "AVSShoebox2", + "sourceMdmNamespace": "Vsphere.Cluster.Mem", + "supportedTimeGrainTypes": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "unit": "Bytes" + }, + { + "aggregationType": "Average", + "displayDescription": "Memory usage as percentage of total configured or available memory", + "displayName": "Average Memory Usage", + "enableRegionalMdmAccount": "true", + "name": "UsageAverage", + "sourceMdmAccount": "AVSShoebox2", + "sourceMdmNamespace": "Vsphere.Cluster.Mem", + "supportedTimeGrainTypes": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "unit": "Percent" + }, + { + "aggregationType": "Average", + "displayDescription": "Total available CPU resources in cluster", + "displayName": "Effective CPU available", + "enableRegionalMdmAccount": "true", + "name": "EffectiveCpuAverage", + "sourceMdmAccount": "AVSShoebox2", + "sourceMdmNamespace": "Vsphere.Cluster.ClusterServices", + "supportedTimeGrainTypes": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "unit": "Percent" + } + ] + } + } + }, + { + "display": { + "description": "Gets the diagnostic setting for the resource", + "operation": "Read diagnostic setting", + "provider": "Microsoft.AVS", + "resource": "privateClouds" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/providers/Microsoft.Insights/diagnosticSettings/read", + "origin": "system", + "properties": {} + }, + { + "display": { + "description": "Creates or updates the diagnostic setting for the resource", + "operation": "Write diagnostic setting", + "provider": "Microsoft.AVS", + "resource": "privateClouds" + }, + "isDataAction": false, + "name": "Microsoft.AVS/privateClouds/providers/Microsoft.Insights/diagnosticSettings/write", + "origin": "system", + "properties": {} + } + ] + } } } -} +} \ No newline at end of file diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json index 1a8d82df26ce..22f020ad6bff 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json @@ -1353,6 +1353,152 @@ "readOnly": true } } + }, + "isDataAction": { + "description": "Gets or sets a value indicating whether the operation is a data action or not", + "type": "boolean" + }, + "origin": { + "description": "Origin of the operation", + "type": "string" + }, + "properties": { + "$ref": "#/definitions/OperationProperties", + "description": "Properties of the operation" + } + } + }, + "OperationProperties": { + "description": "Extra Operation properties", + "type": "object", + "properties": { + "serviceSpecification": { + "$ref": "#/definitions/ServiceSpecification", + "description": "Service specifications of the operation" + } + } + }, + "ServiceSpecification": { + "description": "Service specification payload", + "type": "object", + "properties": { + "logSpecifications": { + "description": "Specifications of the Log for Azure Monitoring", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/LogSpecification" + } + }, + "metricSpecifications": { + "description": "Specifications of the Metrics for Azure Monitoring", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/MetricSpecification" + } + } + } + }, + "LogSpecification": { + "description": "Specifications of the Log for Azure Monitoring", + "type": "object", + "properties": { + "name": { + "description": "Name of the log", + "type": "string" + }, + "displayName": { + "description": "Localized friendly display name of the log", + "type": "string" + }, + "blobDuration": { + "description": "Blob duration of the log", + "type": "string" + } + } + }, + "MetricSpecification": { + "description": "Specifications of the Metrics for Azure Monitoring", + "type": "object", + "properties": { + "name": { + "description": "Name of the metric", + "type": "string" + }, + "displayName": { + "description": "Localized friendly display name of the metric", + "type": "string" + }, + "displayDescription": { + "description": "Localized friendly description of the metric", + "type": "string" + }, + "unit": { + "description": "Unit that makes sense for the metric", + "type": "string" + }, + "category": { + "description": "Name of the metric category that the metric belongs to. A metric can only belong to a single category.", + "type": "string" + }, + "aggregationType": { + "description": "Only provide one value for this field. Valid values: Average, Minimum, Maximum, Total, Count.", + "type": "string" + }, + "supportedAggregationTypes": { + "description": "Supported aggregation types", + "uniqueItems": false, + "type": "array", + "items": { + "type": "string" + } + }, + "supportedTimeGrainTypes": { + "description": "Supported time grain types", + "uniqueItems": false, + "type": "array", + "items": { + "type": "string" + } + }, + "fillGapWithZero": { + "description": "Optional. If set to true, then zero will be returned for time duration where no metric is emitted/published.", + "type": "boolean" + }, + "dimensions": { + "description": "Dimensions of the metric", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/MetricDimension" + } + }, + "enableRegionalMdmAccount": { + "description": "Whether or not the service is using regional MDM accounts.", + "type": "string" + }, + "sourceMdmAccount": { + "description": "The name of the MDM account.", + "type": "string" + }, + "sourceMdmNamespace": { + "description": "The name of the MDM namespace.", + "type": "string" + } + } + }, + "MetricDimension": { + "description": "Specifications of the Dimension of metrics", + "type": "object", + "properties": { + "name": { + "description": "Name of the dimension", + "type": "string" + }, + "displayName": { + "description": "Localized friendly display name of the dimension", + "type": "string" } } }, From a2fe16de19dd0bcf23eeccd14f20bcd2a8e7f1f3 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 15:44:23 -0600 Subject: [PATCH 02/12] remove x-ms-secret from PrivateClouds_ListAdminCredentials return --- .../Microsoft.AVS/stable/2020-03-20/vmware.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json index 22f020ad6bff..e5419f1a7fee 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json @@ -1953,8 +1953,7 @@ "nsxtPassword": { "description": "NSX-T Manager password", "type": "string", - "readOnly": true, - "x-ms-secret": true + "readOnly": true }, "vcenterUsername": { "description": "vCenter admin username", @@ -1964,8 +1963,7 @@ "vcenterPassword": { "description": "vCenter admin password", "type": "string", - "readOnly": true, - "x-ms-secret": true + "readOnly": true } } }, From afa02748920ca55b97781e4ee37e3b4e8bd6d248 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 15:46:29 -0600 Subject: [PATCH 03/12] specify int32 for integers --- .../Microsoft.AVS/stable/2020-03-20/vmware.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json index e5419f1a7fee..5e5c66f714af 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json @@ -1213,6 +1213,7 @@ "availableHosts": { "description": "Number of trial hosts available", "type": "integer", + "format": "int32", "readOnly": true } } @@ -1226,6 +1227,7 @@ "readOnly": true, "additionalProperties": { "type": "integer", + "format": "int32", "readOnly": true } }, @@ -1850,7 +1852,8 @@ "properties": { "clusterSize": { "description": "The cluster size", - "type": "integer" + "type": "integer", + "format": "int32" } } }, @@ -1868,6 +1871,7 @@ "clusterId": { "description": "The identity", "type": "integer", + "format": "int32", "readOnly": true }, "hosts": { From 9f088fe65f5a53449e6ee04d7e4c9e62c7c2aa18 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 16:15:34 -0600 Subject: [PATCH 04/12] add provisioningState to ManagementCluster --- .../stable/2020-03-20/vmware.json | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json index 5e5c66f714af..44af58dd48d8 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json @@ -1868,6 +1868,10 @@ } ], "properties": { + "provisioningState": { + "description": "The state of the cluster provisioning", + "$ref": "#/definitions/ClusterProvisioningState" + }, "clusterId": { "description": "The identity", "type": "integer", @@ -1894,22 +1898,26 @@ "properties": { "provisioningState": { "description": "The state of the cluster provisioning", - "type": "string", - "readOnly": true, - "enum": [ - "Succeeded", - "Failed", - "Cancelled", - "Deleting", - "Updating" - ], - "x-ms-enum": { - "name": "ClusterProvisioningState", - "modelAsString": true - } + "$ref": "#/definitions/ClusterProvisioningState" } } }, + "ClusterProvisioningState": { + "description": "The state of the cluster provisioning", + "type": "string", + "readOnly": true, + "enum": [ + "Succeeded", + "Failed", + "Cancelled", + "Deleting", + "Updating" + ], + "x-ms-enum": { + "name": "ClusterProvisioningState", + "modelAsString": true + } + }, "PrivateCloudList": { "description": "A paged list of private clouds", "properties": { From 4a4ae71cfee327b8c40d0f8ad3700515e963cc4d Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 16:15:53 -0600 Subject: [PATCH 05/12] suppress warnings --- specification/vmware/resource-manager/readme.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/specification/vmware/resource-manager/readme.md b/specification/vmware/resource-manager/readme.md index a381bf23160b..ed07ee71e792 100644 --- a/specification/vmware/resource-manager/readme.md +++ b/specification/vmware/resource-manager/readme.md @@ -38,6 +38,21 @@ directive: - suppress: R3010 from: vmware.json reason: list by immediate parent operations are defined + - suppress: R3027 + from: vmware.json + reasons: the PrivateClouds_List operation is by resource group + - suppress: R3018 + from: vmware.json + where: $.definitions.Operation.properties.isDataAction + reason: standard property for Operation + - suppress: R3018 + from: vmware.json + where: $.definitions.MetricSpecification.properties.fillGapWithZero + reason: standard property for MetricSpecification + - suppress: R2001 + from: vmware.json + where: $.definitions.Operation.properties.properties + reason: x-ms-client-flatten not needed for Operation ``` ### Tag: package-2019-08-09-preview From 7dc9e4f8d048b32019121b7a60678aae9dc5465a Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 16:36:33 -0600 Subject: [PATCH 06/12] prettier --- .../stable/2020-03-20/examples/Operations_List.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json index 3c4216606136..91e66c3b4daf 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/examples/Operations_List.json @@ -521,4 +521,4 @@ } } } -} \ No newline at end of file +} From 214ed733c752ca0763ae4ebc364c9d1119c4bb2a Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 17:12:01 -0600 Subject: [PATCH 07/12] Revert "remove x-ms-secret from PrivateClouds_ListAdminCredentials return" This reverts commit a2fe16de19dd0bcf23eeccd14f20bcd2a8e7f1f3. --- .../Microsoft.AVS/stable/2020-03-20/vmware.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json index 44af58dd48d8..f968128343d7 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json @@ -1965,7 +1965,8 @@ "nsxtPassword": { "description": "NSX-T Manager password", "type": "string", - "readOnly": true + "readOnly": true, + "x-ms-secret": true }, "vcenterUsername": { "description": "vCenter admin username", @@ -1975,7 +1976,8 @@ "vcenterPassword": { "description": "vCenter admin password", "type": "string", - "readOnly": true + "readOnly": true, + "x-ms-secret": true } } }, From d3a567f248d5198e467d24f91a44c1390caa52b3 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 17:26:05 -0600 Subject: [PATCH 08/12] try suppressing SECRET_PROPERTY error --- specification/vmware/resource-manager/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/vmware/resource-manager/readme.md b/specification/vmware/resource-manager/readme.md index ed07ee71e792..472c5e1768ff 100644 --- a/specification/vmware/resource-manager/readme.md +++ b/specification/vmware/resource-manager/readme.md @@ -53,6 +53,12 @@ directive: from: vmware.json where: $.definitions.Operation.properties.properties reason: x-ms-client-flatten not needed for Operation + - suppress: SECRET_PROPERTY + from: vmware.json + where: + - $.definitions.AdminCredentials.properties.nsxtPassword + - $.definitions.AdminCredentials.properties.vcenterPassword + reason: Secrets are OK to return in a POST response. ``` ### Tag: package-2019-08-09-preview From c62949b04239ee88bd8d01b7b2553be9ab5cc392 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 17:37:44 -0600 Subject: [PATCH 09/12] Revert "try suppressing SECRET_PROPERTY error" This reverts commit d3a567f248d5198e467d24f91a44c1390caa52b3. --- specification/vmware/resource-manager/readme.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/vmware/resource-manager/readme.md b/specification/vmware/resource-manager/readme.md index 472c5e1768ff..ed07ee71e792 100644 --- a/specification/vmware/resource-manager/readme.md +++ b/specification/vmware/resource-manager/readme.md @@ -53,12 +53,6 @@ directive: from: vmware.json where: $.definitions.Operation.properties.properties reason: x-ms-client-flatten not needed for Operation - - suppress: SECRET_PROPERTY - from: vmware.json - where: - - $.definitions.AdminCredentials.properties.nsxtPassword - - $.definitions.AdminCredentials.properties.vcenterPassword - reason: Secrets are OK to return in a POST response. ``` ### Tag: package-2019-08-09-preview From 31b80bb8a16bb35b4720a71f1c43bf5b43702353 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 21 Oct 2020 17:38:43 -0600 Subject: [PATCH 10/12] Revert "Revert "remove x-ms-secret from PrivateClouds_ListAdminCredentials return"" This reverts commit 214ed733c752ca0763ae4ebc364c9d1119c4bb2a. --- .../Microsoft.AVS/stable/2020-03-20/vmware.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json index f968128343d7..44af58dd48d8 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json @@ -1965,8 +1965,7 @@ "nsxtPassword": { "description": "NSX-T Manager password", "type": "string", - "readOnly": true, - "x-ms-secret": true + "readOnly": true }, "vcenterUsername": { "description": "vCenter admin username", @@ -1976,8 +1975,7 @@ "vcenterPassword": { "description": "vCenter admin password", "type": "string", - "readOnly": true, - "x-ms-secret": true + "readOnly": true } } }, From 7147cb5d7fc1d5b3c5b3db1edd8d35fb1a41419e Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Thu, 22 Oct 2020 08:11:05 -0600 Subject: [PATCH 11/12] put back x-ms-secret from PrivateClouds_ListAdminCredentials return This reverts commit 31b80bb8a16bb35b4720a71f1c43bf5b43702353. --- .../Microsoft.AVS/stable/2020-03-20/vmware.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json index 44af58dd48d8..f968128343d7 100644 --- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json +++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json @@ -1965,7 +1965,8 @@ "nsxtPassword": { "description": "NSX-T Manager password", "type": "string", - "readOnly": true + "readOnly": true, + "x-ms-secret": true }, "vcenterUsername": { "description": "vCenter admin username", @@ -1975,7 +1976,8 @@ "vcenterPassword": { "description": "vCenter admin password", "type": "string", - "readOnly": true + "readOnly": true, + "x-ms-secret": true } } }, From bbaa6841ceeafc5027b5b2d1f04875a4a22b80be Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Thu, 22 Oct 2020 08:28:04 -0600 Subject: [PATCH 12/12] suppress SECRET_PROPERTY error --- specification/vmware/resource-manager/readme.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/specification/vmware/resource-manager/readme.md b/specification/vmware/resource-manager/readme.md index ed07ee71e792..8d0c35ff08f9 100644 --- a/specification/vmware/resource-manager/readme.md +++ b/specification/vmware/resource-manager/readme.md @@ -94,6 +94,17 @@ swagger-to-sdk: - node sdkauto_afterscript.js vmware/resource-manager ``` +## Suppression +``` +directive: + - suppress: SECRET_PROPERTY + from: vmware.json + where: + - $.definitions.AdminCredentials.properties.nsxtPassword + - $.definitions.AdminCredentials.properties.vcenterPassword + reason: Secrets are OK to return in a POST response. +``` + ## TypeScript See configuration in [readme.typescript.md](./readme.typescript.md)