Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sfrp 2020-01-01-preview #10268

Merged
merged 10 commits into from
Jul 28, 2020
Merged

Fix sfrp 2020-01-01-preview #10268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a816166
changing default version in readme for sdk generation
Jul 23, 2020
c826c43
adding managedclusters and nodetypes to tag package-2020-03 so sdk is…
Jul 24, 2020
7e3ec9c
use the same AzureActiveDirectory model and rename others that have d…
Jul 24, 2020
bb50273
fix lintDiff
Jul 24, 2020
c8ec1dd
fix lintDiff 2
Jul 24, 2020
6da7cd3
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
Jul 27, 2020
7e779b9
fix arrays and missing properties
Jul 28, 2020
7122bbc
rename provisioning state to ManagedResourseProvisioningState to avoi…
Jul 28, 2020
e175b96
fix typo
Jul 28, 2020
aab1454
add forceUpdateTag to the examples
Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...soft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeListOperation_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
"properties": {
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"publisher": "Microsoft.Azure.Geneva",
"type": "GenevaMonitoring",
"typeHandlerVersion": "2.0",
Expand Down
3 changes: 0 additions & 3 deletions ...oft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePatchOperation_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
"properties": {
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"publisher": "Microsoft.Azure.Geneva",
"type": "GenevaMonitoring",
"typeHandlerVersion": "2.0",
Expand Down Expand Up @@ -96,7 +95,6 @@
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
"properties": {
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"publisher": "Microsoft.Azure.Geneva",
"type": "GenevaMonitoring",
"typeHandlerVersion": "2.0",
Expand Down Expand Up @@ -154,7 +152,6 @@
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
"properties": {
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"publisher": "Microsoft.Azure.Geneva",
"type": "GenevaMonitoring",
"typeHandlerVersion": "2.0",
Expand Down
6 changes: 2 additions & 4 deletions ...t.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypePutOperation_example_max.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
"properties": {
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"publisher": "Microsoft.Azure.Geneva",
"type": "GenevaMonitoring",
"typeHandlerVersion": "2.0",
Expand Down Expand Up @@ -98,7 +97,6 @@
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
"properties": {
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"publisher": "Microsoft.Azure.Geneva",
"type": "GenevaMonitoring",
"typeHandlerVersion": "2.0",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
51 changes: 34 additions & 17 deletions ...c/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
36 changes: 32 additions & 4 deletions ...efabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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."
Expand All @@ -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."
Expand All @@ -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."
Expand Down