Skip to content

Commit

Permalink
Managed Clusters Generate SDK (#10247)
Browse files Browse the repository at this point in the history 
* 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 array types

* fix examples

Co-authored-by: Alfredo Santamaria Gomez <alsantam@microsoft.com>
  • Loading branch information
@a-santamaria
a-santamaria and Alfredo Santamaria Gomez authored Jul 27, 2020
1 parent fd3d447 commit 3903ebe
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 44 deletions.
3 changes: 2 additions & 1 deletion ...viceFabric/preview/2020-01-01-preview/examples/ManagedClusterDeleteOperation_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
}
9 changes: 6 additions & 3 deletions ...ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "tcp"
}
],
"adminUserName": "vmadmin",
Expand Down
27 changes: 18 additions & 9 deletions ...rviceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "tcp"
}
],
"fabricSettings": [
Expand Down Expand Up @@ -113,17 +116,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "tcp"
}
],
"adminUserName": "vmadmin",
Expand Down Expand Up @@ -211,17 +217,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "http"
}
],
"adminUserName": "vmadmin",
Expand Down
36 changes: 24 additions & 12 deletions ...iceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "http"
}
],
"fabricSettings": [
Expand Down Expand Up @@ -122,17 +125,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "tcp"
}
],
"adminUserName": "vmadmin",
Expand Down Expand Up @@ -223,17 +229,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "tcp"
}
],
"adminUserName": "vmadmin",
Expand Down Expand Up @@ -324,17 +333,20 @@
{
"frontendPort": 80,
"backendPort": 80,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 443,
"backendPort": 443,
"protocol": "http"
"protocol": "http",
"probeProtocol": "http"
},
{
"frontendPort": 10000,
"backendPort": 10000,
"protocol": "tcp"
"protocol": "tcp",
"probeProtocol": "tcp"
}
],
"adminUserName": "vmadmin",
Expand Down
3 changes: 2 additions & 1 deletion ...ft.ServiceFabric/preview/2020-01-01-preview/examples/NodeTypeDeleteOperation_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
}
47 changes: 31 additions & 16 deletions ...c/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
],
"tags": [
"Cluster"
"ManagedCluster"
],
"x-ms-pageable": {
"nextLinkName": "nextLink"
Expand Down Expand Up @@ -327,6 +327,9 @@
"204": {
"description": "The resource was not found."
},
"200": {
"description": "The operation completed successfully."
},
"default": {
"description": "The detailed error response.",
"schema": {
Expand Down Expand Up @@ -405,37 +408,38 @@
"schema": {
"type": "array",
"items": {
"$ref": "#/definitions/ClusterVersionDetails"
"$ref": "#/definitions/ManagedClusterVersionDetails"
},
"description": "The list of available Service Fabric runtime versions."
}
},
"default": {
"description": "The detailed error response.",
"schema": {
"$ref": "#/definitions/ErrorModel"
}
}
}
}
}
},
"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": [
Expand Down Expand Up @@ -487,7 +491,7 @@
"Ready"
]
},
"ClusterVersionDetails": {
"ManagedClusterVersionDetails": {
"properties": {
"msiVersion": {
"type": "string",
Expand All @@ -514,12 +518,14 @@
"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
},
"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
Expand Down Expand Up @@ -629,11 +635,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
},
Expand All @@ -649,16 +657,19 @@
},
"loadBalancingRules": {
"type": "array",
"$ref": "#/definitions/LoadBalancingRule",
"description": "Describes a load balancing rule."
"items": {
"$ref": "#/definitions/LoadBalancingRule"
},
"description": "Describes load balancing rules."
},
"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."
},
Expand Down Expand Up @@ -696,6 +707,7 @@
},
"reverseProxyEndpointPort": {
"type": "integer",
"format": "int32",
"description": "The endpoint used by reverse proxy."
}
},
Expand All @@ -705,10 +717,12 @@
"properties": {
"clientConnectionPort": {
"type": "integer",
"format": "int32",
"description": "The port used for client connections to the cluster."
},
"httpGatewayConnectionPort": {
"type": "integer",
"format": "int32",
"description": "The port used for http connections to the cluster."
},
"loadBalancingRules": {
Expand Down Expand Up @@ -745,6 +759,7 @@
},
"reverseProxyEndpointPort": {
"type": "integer",
"format": "int32",
"description": "The endpoint used by reverse proxy."
}
},
Expand Down
Loading

0 comments on commit 3903ebe

Please sign in to comment.