From a81616616a4a43582bd4d9839ce03c3c3a10d63b Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Thu, 23 Jul 2020 14:19:46 -0700 Subject: [PATCH 1/9] changing default version in readme for sdk generation --- .../preview/2020-01-01-preview/managedcluster.json | 2 +- specification/servicefabric/resource-manager/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index c32defd2363e..a5ba35cb1fca 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -51,7 +51,7 @@ } ], "tags": [ - "Cluster" + "ManagedCluster" ], "x-ms-pageable": { "nextLinkName": "nextLink" diff --git a/specification/servicefabric/resource-manager/readme.md b/specification/servicefabric/resource-manager/readme.md index 0e301cceb90e..b25f10af98d7 100644 --- a/specification/servicefabric/resource-manager/readme.md +++ b/specification/servicefabric/resource-manager/readme.md @@ -28,7 +28,7 @@ These are the global settings for the ServiceFabricManagementClient API. title: ServiceFabricManagementClient description: Service Fabric Management Client openapi-type: arm -tag: package-2020-03 +tag: package-2020-01-preview directive: - suppress: ListInOperationName From c826c43c7a433bcd55842b4805d33a6f2a5b53b7 Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Thu, 23 Jul 2020 18:20:15 -0700 Subject: [PATCH 2/9] adding managedclusters and nodetypes to tag package-2020-03 so sdk is generated for all --- specification/servicefabric/resource-manager/readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/servicefabric/resource-manager/readme.md b/specification/servicefabric/resource-manager/readme.md index b25f10af98d7..f9f151dcd57c 100644 --- a/specification/servicefabric/resource-manager/readme.md +++ b/specification/servicefabric/resource-manager/readme.md @@ -28,7 +28,7 @@ These are the global settings for the ServiceFabricManagementClient API. title: ServiceFabricManagementClient description: Service Fabric Management Client openapi-type: arm -tag: package-2020-01-preview +tag: package-2020-03 directive: - suppress: ListInOperationName @@ -68,6 +68,8 @@ These settings apply only when `--tag=package-2020-03` is specified on the comma input-file: - Microsoft.ServiceFabric/stable/2020-03-01/cluster.json - Microsoft.ServiceFabric/stable/2020-03-01/application.json +- Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +- Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json ``` ### Tag: package-2020-01-preview From 7e3ec9c5544b81a0b3d51b754ded3dc3bc5c6fa9 Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Thu, 23 Jul 2020 18:42:50 -0700 Subject: [PATCH 3/9] use the same AzureActiveDirectory model and rename others that have differences --- .../2020-01-01-preview/managedcluster.json | 17 ++++++----------- .../preview/2020-01-01-preview/nodetype.json | 4 ++-- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index a5ba35cb1fca..b743f5249c7a 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -405,7 +405,7 @@ "schema": { "type": "array", "items": { - "$ref": "#/definitions/ClusterVersionDetails" + "$ref": "#/definitions/ManagedClusterVersionDetails" }, "description": "The list of available Service Fabric runtime versions." } @@ -416,26 +416,21 @@ }, "definitions": { "AzureActiveDirectory": { - "required": [ - "tenantId", - "clusterApplication", - "clientApplication" - ], "properties": { "tenantId": { - "type": "boolean", + "type": "string", "description": "Azure active directory tenant id." }, "clusterApplication": { "type": "string", - "description": "Azure active directory cluster application." + "description": "Azure active directory cluster application id." }, "clientApplication": { "type": "string", - "description": "Azure active directory client application." + "description": "Azure active directory client application id." } }, - "description": "Azure active directory." + "description": "The settings to enable AAD authentication on the cluster." }, "ClientCertificate": { "required": [ @@ -487,7 +482,7 @@ "Ready" ] }, - "ClusterVersionDetails": { + "ManagedClusterVersionDetails": { "properties": { "msiVersion": { "type": "string", diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index a3105dbd9133..b3f4a8bb759b 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -540,7 +540,7 @@ "description": "The node type definition" }, { - "$ref": "#/definitions/ProxyResource" + "$ref": "#/definitions/ManagedProxyResource" } ], "properties": { @@ -740,7 +740,7 @@ }, "description": "Node type update request" }, - "ProxyResource": { + "ManagedProxyResource": { "properties": { "id": { "type": "string", From bb50273d92028f2caef7e0e81987cddf8a5437d1 Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Thu, 23 Jul 2020 19:13:26 -0700 Subject: [PATCH 4/9] fix lintDiff --- .../ManagedClusterDeleteOperation_example.json | 3 ++- .../examples/NodeTypeDeleteOperation_example.json | 3 ++- .../2020-01-01-preview/managedcluster.json | 15 +++++++++++++++ .../preview/2020-01-01-preview/nodetype.json | 4 ++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json index e638a101cb12..d59d195b8d47 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json @@ -11,6 +11,7 @@ "Location": "http://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/managedClusterOperationResults/1ca6e48d-70ca-4e43-b652-3b0522f64d67?api-version=2020-01-01-preview" } }, - "204": {} + "204": {}, + "200": {} } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json index 2f38d90c3430..577f254ca490 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json @@ -12,6 +12,7 @@ "Location": "http://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/managedClusterOperationResults/1ca6e48d-70ca-4e43-b652-3b0522f64d67?api-version=2020-01-01-preview" } }, - "204": {} + "204": {}, + "200": {} } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index b743f5249c7a..9e47eb892353 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -327,6 +327,9 @@ "204": { "description": "The resource was not found." }, + "200": { + "description": "The operation completed successfully." + }, "default": { "description": "The detailed error response.", "schema": { @@ -409,6 +412,12 @@ }, "description": "The list of available Service Fabric runtime versions." } + }, + "default": { + "description": "The detailed error response.", + "schema": { + "$ref": "#/definitions/ErrorModel" + } } } } @@ -515,6 +524,7 @@ }, "backendPort": { "type": "integer", + "format": "int32", "description": "The port used for internal connections on the endpoint. Acceptable values are between 1 and 65535.", "minimum": 1, "maximum": 65534 @@ -624,11 +634,13 @@ }, "clientConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for client connections to the cluster.", "default": 19000 }, "httpGatewayConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for http connections to the cluster.", "default": 19080 }, @@ -691,6 +703,7 @@ }, "reverseProxyEndpointPort": { "type": "integer", + "format": "int32", "description": "The endpoint used by reverse proxy." } }, @@ -704,6 +717,7 @@ }, "httpGatewayConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for http connections to the cluster." }, "loadBalancingRules": { @@ -740,6 +754,7 @@ }, "reverseProxyEndpointPort": { "type": "integer", + "format": "int32", "description": "The endpoint used by reverse proxy." } }, diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index b3f4a8bb759b..ba4b355c10ff 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -523,6 +523,9 @@ "204": { "description": "The resource was not found." }, + "200": { + "description": "The operation completed successfully." + }, "default": { "description": "The detailed error response.", "schema": { @@ -584,6 +587,7 @@ }, "vmInstanceCount": { "type": "integer", + "format": "int32", "description": "The number of nodes in the node type. This count should match the capacity property in the corresponding VirtualMachineScaleSet resource.", "minimum": 1, "maximum": 2147483647 From c8ec1ddbde0e558518d1bdc6f992de25408537f1 Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Thu, 23 Jul 2020 19:19:52 -0700 Subject: [PATCH 5/9] fix lintDiff 2 --- .../preview/2020-01-01-preview/managedcluster.json | 2 ++ .../preview/2020-01-01-preview/nodetype.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index 9e47eb892353..f26961aba14f 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -518,6 +518,7 @@ "properties": { "frontendPort": { "type": "integer", + "format": "int32", "description": "The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values are between 1 and 65534.", "minimum": 1, "maximum": 65534 @@ -713,6 +714,7 @@ "properties": { "clientConnectionPort": { "type": "integer", + "format": "int32", "description": "The port used for client connections to the cluster." }, "httpGatewayConnectionPort": { diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index ba4b355c10ff..dfaf46442833 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -594,6 +594,7 @@ }, "diskSizeInGB": { "type": "integer", + "format": "int32", "description": "Disk size for each vm in the node type in GBs." }, "placementProperties": { @@ -680,6 +681,7 @@ "properties": { "vmInstanceCount": { "type": "integer", + "format": "int32", "description": "The number of nodes in the node type. This count should match the capacity property in the corresponding VirtualMachineScaleSet resource.", "minimum": 1, "maximum": 2147483647 From 7e779b9f354e995054bfd1eb9ba40ce4970ccf59 Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Mon, 27 Jul 2020 18:04:27 -0700 Subject: [PATCH 6/9] fix arrays and missing properties --- .../NodeTypeListOperation_example.json | 1 - .../NodeTypePatchOperation_example.json | 3 -- .../NodeTypePutOperation_example_max.json | 4 --- .../2020-01-01-preview/managedcluster.json | 21 ++++++++--- .../preview/2020-01-01-preview/nodetype.json | 36 ++++++++++++++++--- 5 files changed, 48 insertions(+), 17 deletions(-) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeListOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeListOperation_example.json index 1a613aad579c..de38b7297316 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeListOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeListOperation_example.json @@ -62,7 +62,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePatchOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePatchOperation_example.json index 2237dbe4aa33..393b2122db51 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePatchOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePatchOperation_example.json @@ -37,7 +37,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", @@ -96,7 +95,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", @@ -154,7 +152,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json index a6a90dab1744..5c18dfb75272 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json @@ -41,7 +41,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", @@ -98,7 +97,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", @@ -154,7 +152,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", @@ -210,7 +207,6 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index b3ea64d33cb4..e4350f8b8755 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -675,9 +675,15 @@ }, "fabricSettings": { "type": "array", - "$ref": "#/definitions/SettingsSectionDescription", + "items": { + "$ref": "#/definitions/SettingsSectionDescription" + }, "description": "The list of custom fabric settings to configure the cluster." }, + "useTestExtension": { + "type": "boolean", + "description": "Use service fabric test vm extension, by default it's false." + }, "provisioningState": { "type": "string", "description": "The provisioning state of the managed cluster resource.", @@ -727,22 +733,27 @@ }, "loadBalancingRules": { "type": "array", - "$ref": "#/definitions/LoadBalancingRule", + "items": { + "$ref": "#/definitions/LoadBalancingRule" + }, "description": "Describes a load balancing rule." }, "clients": { "type": "array", - "$ref": "#/definitions/ClientCertificate", + "items": { + "$ref": "#/definitions/ClientCertificate" + }, "description": "client certificates for the cluster." }, "azureActiveDirectory": { - "type": "array", "$ref": "#/definitions/AzureActiveDirectory", "description": "Azure active directory." }, "fabricSettings": { "type": "array", - "$ref": "#/definitions/SettingsSectionDescription", + "items": { + "$ref": "#/definitions/SettingsSectionDescription" + }, "description": "The list of custom fabric settings to configure the cluster." }, "clusterCodeVersion": { diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index dfaf46442833..3a4f52b79fe9 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -656,6 +656,27 @@ "items": { "$ref": "#/definitions/VMSSExtension" } + }, + "provisioningState": { + "type": "string", + "description": "The provisioning state of the node type, which only appears in the response.", + "readOnly": true, + "enum": [ + "None", + "Creating", + "Created", + "Updating", + "Succeeded", + "Failed", + "Canceled", + "Deleting", + "Deleted", + "Other" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } } }, "description": "Describes a node type in the cluster, each node type represents sub set of nodes in the cluster." @@ -850,6 +871,10 @@ "typeHandlerVersion" ], "properties": { + "forceUpdateTag": { + "type": "string", + "description": "If a value is provided and is different from the previous value, the extension handler will be forced to update even if the extension configuration has not changed." + }, "publisher": { "type": "string", "description": "The name of the extension handler publisher." @@ -866,10 +891,6 @@ "type": "boolean", "description": "Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true." }, - "enableAutomaticUpgrade": { - "type": "boolean", - "description": "Indicates if the extension will upgrade automatically." - }, "settings": { "type": "object", "description": "Json formatted public settings for the extension." @@ -882,6 +903,13 @@ "readOnly": true, "type": "string", "description": "The provisioning state, which only appears in the response." + }, + "provisionAfterExtensions": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Collection of extension names after which this extension needs to be provisioned." } }, "description": "Describes the properties of a Virtual Machine Scale Set Extension." From 7122bbcec7e846d60d6adc7e63be8a9426f8d15e Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Mon, 27 Jul 2020 19:04:39 -0700 Subject: [PATCH 7/9] rename provisioning state to ManagedResourseProvisioningState to avoid conflic with non-managed --- .../2020-01-01-preview/managedcluster.json | 30 +++++++++------ .../preview/2020-01-01-preview/nodetype.json | 38 +++++++++---------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index e4350f8b8755..86d6f3e1e6b3 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -685,19 +685,9 @@ "description": "Use service fabric test vm extension, by default it's false." }, "provisioningState": { - "type": "string", + "$ref": "#/definitions/ManagedResourseProvisioningState", "description": "The provisioning state of the managed cluster resource.", - "readOnly": true, - "enum": [ - "Updating", - "Succeeded", - "Failed", - "Canceled" - ], - "x-ms-enum": { - "name": "ProvisioningState", - "modelAsString": true - } + "readOnly": true }, "clusterCodeVersion": { "type": "string", @@ -1004,6 +994,22 @@ }, "description": "The error details." }, + "ManagedResourseProvisioningState": { + "type": "string", + "description": "The provisioning state of the managed resource.", + "enum": [ + "None", + "Creating", + "Created", + "Updating", + "Succeeded", + "Failed", + "Canceled", + "Deleting", + "Deleted", + "Other" + ] + }, "OperationListResult": { "properties": { "value": { diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index 3a4f52b79fe9..20f111822817 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -658,25 +658,9 @@ } }, "provisioningState": { - "type": "string", - "description": "The provisioning state of the node type, which only appears in the response.", - "readOnly": true, - "enum": [ - "None", - "Creating", - "Created", - "Updating", - "Succeeded", - "Failed", - "Canceled", - "Deleting", - "Deleted", - "Other" - ], - "x-ms-enum": { - "name": "ProvisioningState", - "modelAsString": true - } + "$ref": "#/definitions/ManagedResourseProvisioningState", + "description": "The provisioning state of the managed cluster resource.", + "readOnly": true } }, "description": "Describes a node type in the cluster, each node type represents sub set of nodes in the cluster." @@ -799,6 +783,22 @@ "description": "The resource model definition for proxy-only resource.", "x-ms-azure-resource": true }, + "ManagedResourseProvisioningState": { + "type": "string", + "description": "The provisioning state of the managed resource.", + "enum": [ + "None", + "Creating", + "Created", + "Updating", + "Succeeded", + "Failed", + "Canceled", + "Deleting", + "Deleted", + "Other" + ] + }, "SubResource": { "properties": { "id": { From e175b96cda6901bbae022450b75f3898a81bf706 Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Mon, 27 Jul 2020 19:09:21 -0700 Subject: [PATCH 8/9] fix typo --- .../preview/2020-01-01-preview/managedcluster.json | 4 ++-- .../preview/2020-01-01-preview/nodetype.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index 86d6f3e1e6b3..c18b0040ebdf 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -685,7 +685,7 @@ "description": "Use service fabric test vm extension, by default it's false." }, "provisioningState": { - "$ref": "#/definitions/ManagedResourseProvisioningState", + "$ref": "#/definitions/ManagedResourceProvisioningState", "description": "The provisioning state of the managed cluster resource.", "readOnly": true }, @@ -994,7 +994,7 @@ }, "description": "The error details." }, - "ManagedResourseProvisioningState": { + "ManagedResourceProvisioningState": { "type": "string", "description": "The provisioning state of the managed resource.", "enum": [ diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index 20f111822817..ed9a98cd3c88 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -658,7 +658,7 @@ } }, "provisioningState": { - "$ref": "#/definitions/ManagedResourseProvisioningState", + "$ref": "#/definitions/ManagedResourceProvisioningState", "description": "The provisioning state of the managed cluster resource.", "readOnly": true } @@ -783,7 +783,7 @@ "description": "The resource model definition for proxy-only resource.", "x-ms-azure-resource": true }, - "ManagedResourseProvisioningState": { + "ManagedResourceProvisioningState": { "type": "string", "description": "The provisioning state of the managed resource.", "enum": [ From aab1454bd9ebd68ac52ae04eacde0ec835d4d5dd Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Mon, 27 Jul 2020 19:29:42 -0700 Subject: [PATCH 9/9] add forceUpdateTag to the examples --- .../examples/NodeTypePutOperation_example_max.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json index 5c18dfb75272..beb9e1f7a69f 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json @@ -152,6 +152,7 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, + "forceUpdateTag": "v.1.0", "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", @@ -207,6 +208,7 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, + "forceUpdateTag": "v.1.0", "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0",