From cc6727f0efd13dd65fb322b4b73c016199f48eab Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Date: Mon, 27 Jul 2020 19:56:46 -0700 Subject: [PATCH] Fix sfrp 2020-01-01-preview (#10268) * changing default version in readme for sdk generation * adding managedclusters and nodetypes to tag package-2020-03 so sdk is generated for all * use the same AzureActiveDirectory model and rename others that have differences * fix lintDiff * fix lintDiff 2 * fix arrays and missing properties * rename provisioning state to ManagedResourseProvisioningState to avoid conflic with non-managed * fix typo * add forceUpdateTag to the examples Co-authored-by: Alfredo Santamaria Gomez --- .../NodeTypeListOperation_example.json | 1 - .../NodeTypePatchOperation_example.json | 3 -- .../NodeTypePutOperation_example_max.json | 6 +-- .../2020-01-01-preview/managedcluster.json | 51 ++++++++++++------- .../preview/2020-01-01-preview/nodetype.json | 36 +++++++++++-- 5 files changed, 68 insertions(+), 29 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..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 @@ -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,7 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, + "forceUpdateTag": "v.1.0", "publisher": "Microsoft.Azure.Geneva", "type": "GenevaMonitoring", "typeHandlerVersion": "2.0", @@ -210,7 +208,7 @@ "name": "Microsoft.Azure.Geneva.GenevaMonitoring", "properties": { "autoUpgradeMinorVersion": true, - "enableAutomaticUpgrade": true, + "forceUpdateTag": "v.1.0", "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..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 @@ -675,23 +675,19 @@ }, "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", + "$ref": "#/definitions/ManagedResourceProvisioningState", "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", @@ -727,22 +723,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": { @@ -993,6 +994,22 @@ }, "description": "The error details." }, + "ManagedResourceProvisioningState": { + "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 dfaf46442833..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 @@ -656,6 +656,11 @@ "items": { "$ref": "#/definitions/VMSSExtension" } + }, + "provisioningState": { + "$ref": "#/definitions/ManagedResourceProvisioningState", + "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." @@ -778,6 +783,22 @@ "description": "The resource model definition for proxy-only resource.", "x-ms-azure-resource": true }, + "ManagedResourceProvisioningState": { + "type": "string", + "description": "The provisioning state of the managed resource.", + "enum": [ + "None", + "Creating", + "Created", + "Updating", + "Succeeded", + "Failed", + "Canceled", + "Deleting", + "Deleted", + "Other" + ] + }, "SubResource": { "properties": { "id": { @@ -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."