Skip to content

Commit 8240593

Browse files
a-santamariaAlfredo Santamaria Gomez
a-santamaria
and
Alfredo Santamaria Gomez
authored
[Service Fabric Managed Clusters] Adding missing property ClusterUpgradeCadence (#12858)
* adding missing property ClusterUpgradeCadence * change createdByType and lastModifiedAt to strings * remove duplicate operations path * fix sdk-net path typo * commit to rerun automation * remove x-ms-client-flatten for ServiceResource * remove after_scripts automation was failing * rename _Create to _CreateOrUpdate in apps Co-authored-by: Alfredo Santamaria Gomez <[email protected]>
1 parent 3cdac5a commit 8240593

File tree

5 files changed

+46
-183
lines changed

5 files changed

+46
-183
lines changed

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/preview/2021-01-01-preview/examples/ManagedClusterPutOperation_example_max.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@
174174
"enableAutoOSUpgrade": true,
175175
"applicationTypeVersionsCleanupPolicy": {
176176
"maxUnusedVersionsToKeep": 3
177-
}
177+
},
178+
"clusterUpgradeCadence": "Wave1"
178179
}
179180
}
180181
},
@@ -268,7 +269,8 @@
268269
"enableAutoOSUpgrade": true,
269270
"applicationTypeVersionsCleanupPolicy": {
270271
"maxUnusedVersionsToKeep": 3
271-
}
272+
},
273+
"clusterUpgradeCadence": "Wave1"
272274
}
273275
}
274276
}

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/preview/2021-01-01-preview/managedapplication.json‎

Lines changed: 6 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -34,42 +34,6 @@
3434
}
3535
],
3636
"paths": {
37-
"/providers/Microsoft.ServiceFabric/operations": {
38-
"get": {
39-
"tags": [
40-
"Operations"
41-
],
42-
"summary": "Lists all of the available Service Fabric resource provider API operations.",
43-
"description": "Get the list of available Service Fabric resource provider API operations.",
44-
"operationId": "Operations_List",
45-
"parameters": [
46-
{
47-
"name": "api-version",
48-
"in": "query",
49-
"description": "The version of the Service Fabric resource provider API",
50-
"required": true,
51-
"type": "string"
52-
}
53-
],
54-
"responses": {
55-
"200": {
56-
"description": "OK. The request has succeeded.",
57-
"schema": {
58-
"$ref": "#/definitions/OperationListResult"
59-
}
60-
},
61-
"default": {
62-
"description": "Error response describing why the operation failed.",
63-
"schema": {
64-
"$ref": "#/definitions/ErrorModel"
65-
}
66-
}
67-
},
68-
"x-ms-pageable": {
69-
"nextLinkName": "nextLink"
70-
}
71-
}
72-
},
7337
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/managedclusters/{clusterName}/applicationTypes/{applicationTypeName}": {
7438
"get": {
7539
"tags": [
@@ -119,7 +83,7 @@
11983
"tags": [
12084
"ApplicationType"
12185
],
122-
"operationId": "ApplicationTypes_Create",
86+
"operationId": "ApplicationTypes_CreateOrUpdate",
12387
"summary": "Creates or updates a Service Fabric managed application type name resource.",
12488
"description": "Create or update a Service Fabric managed application type name resource with the specified name.",
12589
"parameters": [
@@ -372,7 +336,7 @@
372336
"tags": [
373337
"ApplicationTypeVersion"
374338
],
375-
"operationId": "ApplicationTypeVersions_Create",
339+
"operationId": "ApplicationTypeVersions_CreateOrUpdate",
376340
"summary": "Creates or updates a Service Fabric managed application type version resource.",
377341
"description": "Create or update a Service Fabric managed application type version resource with the specified name.",
378342
"parameters": [
@@ -644,7 +608,7 @@
644608
"tags": [
645609
"Application"
646610
],
647-
"operationId": "Applications_Create",
611+
"operationId": "Applications_CreateOrUpdate",
648612
"summary": "Creates or updates a Service Fabric managed application resource.",
649613
"description": "Create or update a Service Fabric managed application resource with the specified name.",
650614
"parameters": [
@@ -910,7 +874,7 @@
910874
"tags": [
911875
"Service"
912876
],
913-
"operationId": "Services_Create",
877+
"operationId": "Services_CreateOrUpdate",
914878
"summary": "Creates or updates a Service Fabric managed service resource.",
915879
"description": "Create or update a Service Fabric managed service resource with the specified name.",
916880
"parameters": [
@@ -2198,7 +2162,6 @@
21982162
"description": "The service resource.",
21992163
"properties": {
22002164
"properties": {
2201-
"x-ms-client-flatten": true,
22022165
"$ref": "#/definitions/ServiceResourceProperties"
22032166
}
22042167
},
@@ -2602,23 +2565,6 @@
26022565
},
26032566
"description": "The error details."
26042567
},
2605-
"OperationListResult": {
2606-
"properties": {
2607-
"value": {
2608-
"type": "array",
2609-
"description": "List of operations supported by the Service Fabric resource provider.",
2610-
"items": {
2611-
"$ref": "#/definitions/OperationResult"
2612-
}
2613-
},
2614-
"nextLink": {
2615-
"type": "string",
2616-
"description": "URL to get the next set of operation list results if there are any.",
2617-
"readOnly": true
2618-
}
2619-
},
2620-
"description": "Describes the result of the request to list Service Fabric resource provider operations."
2621-
},
26222568
"OperationResult": {
26232569
"properties": {
26242570
"name": {
@@ -2655,17 +2601,7 @@
26552601
},
26562602
"createdByType": {
26572603
"type": "string",
2658-
"description": "The type of identity that created the resource.",
2659-
"enum": [
2660-
"User",
2661-
"Application",
2662-
"ManagedIdentity",
2663-
"Key"
2664-
],
2665-
"x-ms-enum": {
2666-
"name": "createdByType",
2667-
"modelAsString": true
2668-
}
2604+
"description": "The type of identity that created the resource."
26692605
},
26702606
"createdAt": {
26712607
"type": "string",
@@ -2678,17 +2614,7 @@
26782614
},
26792615
"lastModifiedByType": {
26802616
"type": "string",
2681-
"description": "The type of identity that last modified the resource.",
2682-
"enum": [
2683-
"User",
2684-
"Application",
2685-
"ManagedIdentity",
2686-
"Key"
2687-
],
2688-
"x-ms-enum": {
2689-
"name": "createdByType",
2690-
"modelAsString": true
2691-
}
2617+
"description": "The type of identity that last modified the resource."
26922618
},
26932619
"lastModifiedAt": {
26942620
"type": "string",

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/preview/2021-01-01-preview/managedcluster.json‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,33 @@
430430
},
431431
"description": "Client certificate definition."
432432
},
433+
"ClusterUpgradeCadence": {
434+
"type": "string",
435+
"enum": [
436+
"Wave0",
437+
"Wave1",
438+
"Wave2"
439+
],
440+
"x-ms-enum": {
441+
"name": "clusterUpgradeCadence",
442+
"modelAsString": true,
443+
"values": [
444+
{
445+
"value": "Wave0",
446+
"description": "Cluster upgrade starts immediately after a new version is rolled out. Recommended for Test/Dev clusters."
447+
},
448+
{
449+
"value": "Wave1",
450+
"description": "Cluster upgrade starts 7 days after a new version is rolled out. Recommended for Pre-prod clusters."
451+
},
452+
{
453+
"value": "Wave2",
454+
"description": "Cluster upgrade starts 14 days after a new version is rolled out. Recommended for Production clusters."
455+
}
456+
]
457+
},
458+
"description": "Indicates when new cluster runtime version upgrades will be applied after they are released. By default is Wave0."
459+
},
433460
"ClusterState": {
434461
"type": "string",
435462
"description": "The current state of the cluster.\n\n - WaitingForNodes - Indicates that the cluster resource is created and the resource provider is waiting for Service Fabric VM extension to boot up and report to it.\n - Deploying - Indicates that the Service Fabric runtime is being installed on the VMs. Cluster resource will be in this state until the cluster boots up and system services are up.\n - BaselineUpgrade - Indicates that the cluster is upgrading to establishes the cluster version. This upgrade is automatically initiated when the cluster boots up for the first time.\n - Upgrading - Indicates that the cluster is being upgraded with the user provided configuration.\n - UpgradeFailed - Indicates that the last upgrade for the cluster has failed.\n - Ready - Indicates that the cluster is in a stable state.\n",
@@ -639,6 +666,10 @@
639666
"type": "string",
640667
"description": "The Service Fabric runtime version of the cluster. This property can only by set the user when **upgradeMode** is set to 'Manual'. To get list of available Service Fabric versions for new clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of available version for existing clusters use **availableClusterVersions**."
641668
},
669+
"clusterUpgradeCadence": {
670+
"$ref": "#/definitions/ClusterUpgradeCadence",
671+
"description": "Indicates when new cluster runtime version upgrades will be applied after they are released. By default is Wave0."
672+
},
642673
"addonFeatures": {
643674
"type": "array",
644675
"items": {
@@ -981,17 +1012,7 @@
9811012
},
9821013
"createdByType": {
9831014
"type": "string",
984-
"description": "The type of identity that created the resource.",
985-
"enum": [
986-
"User",
987-
"Application",
988-
"ManagedIdentity",
989-
"Key"
990-
],
991-
"x-ms-enum": {
992-
"name": "createdByType",
993-
"modelAsString": true
994-
}
1015+
"description": "The type of identity that created the resource."
9951016
},
9961017
"createdAt": {
9971018
"type": "string",
@@ -1004,17 +1025,7 @@
10041025
},
10051026
"lastModifiedByType": {
10061027
"type": "string",
1007-
"description": "The type of identity that last modified the resource.",
1008-
"enum": [
1009-
"User",
1010-
"Application",
1011-
"ManagedIdentity",
1012-
"Key"
1013-
],
1014-
"x-ms-enum": {
1015-
"name": "createdByType",
1016-
"modelAsString": true
1017-
}
1028+
"description": "The type of identity that last modified the resource."
10181029
},
10191030
"lastModifiedAt": {
10201031
"type": "string",

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/preview/2021-01-01-preview/nodetype.json‎

Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -34,42 +34,6 @@
3434
}
3535
],
3636
"paths": {
37-
"/providers/Microsoft.ServiceFabric/operations": {
38-
"get": {
39-
"tags": [
40-
"Operations"
41-
],
42-
"summary": "Lists all of the available Service Fabric resource provider API operations.",
43-
"description": "Get the list of available Service Fabric resource provider API operations.",
44-
"operationId": "Operations_List",
45-
"parameters": [
46-
{
47-
"name": "api-version",
48-
"in": "query",
49-
"description": "The version of the Service Fabric resource provider API",
50-
"required": true,
51-
"type": "string"
52-
}
53-
],
54-
"responses": {
55-
"200": {
56-
"description": "OK. The request has succeeded.",
57-
"schema": {
58-
"$ref": "#/definitions/OperationListResult"
59-
}
60-
},
61-
"default": {
62-
"description": "Error response describing why the operation failed.",
63-
"schema": {
64-
"$ref": "#/definitions/ErrorModel"
65-
}
66-
}
67-
},
68-
"x-ms-pageable": {
69-
"nextLinkName": "nextLink"
70-
}
71-
}
72-
},
7337
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/managedClusters/{clusterName}/nodeTypes": {
7438
"get": {
7539
"operationId": "NodeTypes_ListByManagedClusters",
@@ -913,23 +877,6 @@
913877
"Other"
914878
]
915879
},
916-
"OperationListResult": {
917-
"properties": {
918-
"value": {
919-
"type": "array",
920-
"description": "List of operations supported by the Service Fabric resource provider.",
921-
"items": {
922-
"$ref": "#/definitions/OperationResult"
923-
}
924-
},
925-
"nextLink": {
926-
"type": "string",
927-
"description": "URL to get the next set of operation list results if there are any.",
928-
"readOnly": true
929-
}
930-
},
931-
"description": "Describes the result of the request to list Service Fabric resource provider operations."
932-
},
933880
"OperationResult": {
934881
"properties": {
935882
"name": {
@@ -966,17 +913,7 @@
966913
},
967914
"createdByType": {
968915
"type": "string",
969-
"description": "The type of identity that created the resource.",
970-
"enum": [
971-
"User",
972-
"Application",
973-
"ManagedIdentity",
974-
"Key"
975-
],
976-
"x-ms-enum": {
977-
"name": "createdByType",
978-
"modelAsString": true
979-
}
916+
"description": "The type of identity that created the resource."
980917
},
981918
"createdAt": {
982919
"type": "string",
@@ -989,17 +926,7 @@
989926
},
990927
"lastModifiedByType": {
991928
"type": "string",
992-
"description": "The type of identity that last modified the resource.",
993-
"enum": [
994-
"User",
995-
"Application",
996-
"ManagedIdentity",
997-
"Key"
998-
],
999-
"x-ms-enum": {
1000-
"name": "createdByType",
1001-
"modelAsString": true
1002-
}
929+
"description": "The type of identity that last modified the resource."
1003930
},
1004931
"lastModifiedAt": {
1005932
"type": "string",

‎specification/servicefabricmanagedclusters/resource-manager/readme.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,8 @@ swagger-to-sdk:
9494
- repo: azure-sdk-for-net
9595
- repo: azure-sdk-for-python
9696
- repo: azure-resource-manager-schemas
97-
after_scripts:
98-
- node sdkauto_afterscript.js servicefabricmanagedlusters/resource-manager
9997
```
10098
101-
10299
## C#
103100
104101
These settings apply only when `--csharp` is specified on the command line.
@@ -110,7 +107,7 @@ csharp:
110107
license-header: MICROSOFT_MIT_NO_VERSION
111108
namespace: Microsoft.Azure.Management.ServiceFabricManagedClusters
112109
payload-flattening-threshold: 1
113-
output-folder: $(csharp-sdks-folder)/servicefabricmanagedlusters/Microsoft.Azure.Management.ServiceFabricManagedClusters/src/Generated
110+
output-folder: $(csharp-sdks-folder)/servicefabricmanagedclusters/Microsoft.Azure.Management.ServiceFabricManagedClusters/src/Generated
114111
clear-output-folder: true
115112
```
116113

0 commit comments

Comments
 (0)