From f333641d137d4ff966bcb02887532889363ffd47 Mon Sep 17 00:00:00 2001 From: Qingqing Date: Tue, 8 Jan 2019 13:36:16 -0800 Subject: [PATCH] [AKS]: Remove 200/OK response from reset SP/AAD api (#4948) * add operation for 2018-03-31 and 2018-08-01-preview * correct example fileName * add default response and 202, correct typo * remove 200 response * long running operation * return 202 with no body * forget to remove 202 body from 2018-08-01-preview api * add 200 without schema --- .../ManagedClustersResetAADProfile.json | 56 +------------------ ...dClustersResetServicePrincipalProfile.json | 51 +---------------- .../2018-08-01-preview/managedClusters.json | 20 ++----- .../ManagedClustersResetAADProfile.json | 56 +------------------ ...dClustersResetServicePrincipalProfile.json | 51 +---------------- .../stable/2018-03-31/managedClusters.json | 20 ++----- 6 files changed, 12 insertions(+), 242 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetAADProfile.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetAADProfile.json index d0191f93e886..99c963c19ed3 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetAADProfile.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetAADProfile.json @@ -14,61 +14,7 @@ } }, "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS1_v2", - "storageProfile": "ManagedDisks", - "maxPods": 110, - "osType": "Linux" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "aadProfile": { - "clientAppID": "clientappid", - "serverAppID": "serverappid", - "tenantID": "tenantid" - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": false, - "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", - "networkProfile": { - "networkPlugin": "kubenet", - "podCidr": "10.244.0.0/16", - "serviceCidr": "10.0.0.0/16", - "dnsServiceIP": "10.0.0.10", - "dockerBridgeCidr": "172.17.0.1/16" - } - } - } - } + "202": {} } } \ No newline at end of file diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetServicePrincipalProfile.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetServicePrincipalProfile.json index c1f93e9bc5f0..35b6a46560a8 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetServicePrincipalProfile.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetServicePrincipalProfile.json @@ -12,56 +12,7 @@ } }, "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS1_v2", - "storageProfile": "ManagedDisks", - "maxPods": 110, - "osType": "Linux" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": false, - "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", - "networkProfile": { - "networkPlugin": "kubenet", - "podCidr": "10.244.0.0/16", - "serviceCidr": "10.0.0.0/16", - "dnsServiceIP": "10.0.0.10", - "dockerBridgeCidr": "172.17.0.1/16" - } - } - } - } + "202": {} } } \ No newline at end of file diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/managedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/managedClusters.json index 41c94c229dc0..eaf521747b91 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/managedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-08-01-preview/managedClusters.json @@ -573,16 +573,10 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "OK" }, "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "Accepted" }, "default": { "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.", @@ -641,16 +635,10 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "OK" }, "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "Accepted" }, "default": { "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.", diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetAADProfile.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetAADProfile.json index 5b1418a8da45..4944798f572f 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetAADProfile.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetAADProfile.json @@ -14,61 +14,7 @@ } }, "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS1_v2", - "storageProfile": "ManagedDisks", - "maxPods": 110, - "osType": "Linux" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "aadProfile": { - "clientAppID": "clientappid", - "serverAppID": "serverappid", - "tenantID": "tenantid" - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": false, - "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", - "networkProfile": { - "networkPlugin": "kubenet", - "podCidr": "10.244.0.0/16", - "serviceCidr": "10.0.0.0/16", - "dnsServiceIP": "10.0.0.10", - "dockerBridgeCidr": "172.17.0.1/16" - } - } - } - } + "202": {} } } \ No newline at end of file diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetServicePrincipalProfile.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetServicePrincipalProfile.json index 6a14e1456664..ccea0e49bf33 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetServicePrincipalProfile.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetServicePrincipalProfile.json @@ -12,56 +12,7 @@ } }, "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS1_v2", - "storageProfile": "ManagedDisks", - "maxPods": 110, - "osType": "Linux" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": false, - "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", - "networkProfile": { - "networkPlugin": "kubenet", - "podCidr": "10.244.0.0/16", - "serviceCidr": "10.0.0.0/16", - "dnsServiceIP": "10.0.0.10", - "dockerBridgeCidr": "172.17.0.1/16" - } - } - } - } + "202": {} } } \ No newline at end of file diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json index e268167e5442..c3c3f5daf23d 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json @@ -573,16 +573,10 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "OK" }, "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "Accepted" } }, "x-ms-long-running-operation": true, @@ -635,16 +629,10 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "OK" }, "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ManagedCluster" - } + "description": "Accepted" } }, "x-ms-long-running-operation": true,