Merge pull request Azure#8 from nikkomiu/bugfix/validation-errors

Bugfix/validation errors
nikkomiu · Apr 19, 2023 · 19c4786 · 19c4786
2 parents efbafc7 + b289a32
commit 19c4786
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 40 deletions.
diff --git a/...crosoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionType.json b/...crosoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionType.json
@@ -7,7 +7,7 @@
     "clusterName": "my-cluster",
     "extensionTypeName": "my-extension-type",
     "releaseTrain": "stable",
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {
@@ -33,8 +33,13 @@
           "supportedScopes": {
             "defaultScope": "cluster",
             "clusterScopeSettings": {
-              "allowMultipleInstances": true,
-              "defaultReleaseNamespace": "kube-system"
+              "properties": {
+                "allowMultipleInstances": true,
+                "defaultReleaseNamespace": "kube-system"
+              },
+              "id": "aaaaaaaaaaaaaaaaaa",
+              "name": "bbbbbbbbbbbbb",
+              "type": "ccccccccccccccccccccccccc"
             }
           }
         }

diff --git a/...bernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeByLocation.json b/...bernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeByLocation.json
@@ -4,7 +4,7 @@
     "location": "westus2",
     "extensionTypeName": "extensionType1",
     "releaseTrain": "stable",
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {
@@ -30,8 +30,13 @@
           "supportedScopes": {
             "defaultScope": "cluster",
             "clusterScopeSettings": {
-              "allowMultipleInstances": true,
-              "defaultReleaseNamespace": "kube-system"
+              "properties": {
+                "allowMultipleInstances": true,
+                "defaultReleaseNamespace": "kube-system"
+              },
+              "id": "aaaaaaaaaaaaaaaaaa",
+              "name": "bbbbbbbbbbbbb",
+              "type": "ccccccccccccccccccccccccc"
             }
           }
         }

diff --git a/....KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeVersion.json b/....KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeVersion.json
@@ -6,8 +6,9 @@
     "clusterResourceName": "connectedClusters",
     "clusterName": "my-cluster",
     "extensionTypeName": "my-extension-type",
+    "versionNumber": "v1.3.2",
     "releaseTrain": "stable",
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {

diff --git a/...sConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeVersionByLocation.json b/...sConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeVersionByLocation.json
@@ -1,12 +1,12 @@
 {
   "parameters": {
-    "subcriptionId": "subId1",
+    "subscriptionId": "subId1",
     "location": "westus",
     "extensionTypeName": "extensionType1",
     "versionNumber": "1.20.0",
     "releaseTrain": "stable",
     "clusterType": "connectedCluster",
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {

diff --git a/...ubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypeVersions.json b/...ubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypeVersions.json
@@ -9,7 +9,7 @@
     "releaseTrain": "stable",
     "majorVersion": "2",
     "showLatest": true,
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {

diff --git a/...onfiguration/preview/2023-05-01-preview/examples/ListExtensionTypeVersionsByLocation.json b/...onfiguration/preview/2023-05-01-preview/examples/ListExtensionTypeVersionsByLocation.json
@@ -1,13 +1,13 @@
 {
   "parameters": {
-    "subcriptionId": "subId1",
+    "subscriptionId": "subId1",
     "location": "westus",
     "extensionTypeName": "extensionType1",
     "releaseTrain": "stable",
     "clusterType": "connectedCluster",
     "majorVersion": "2",
     "showLatest": true,
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {

diff --git a/...osoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypes.json b/...osoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypes.json
@@ -2,14 +2,14 @@
   "parameters": {
     "subscriptionId": "subId1",
     "resourceGroupName": "rg1",
-    "clusterRP": "Microsoft.Kubernetes",
+    "clusterRp": "Microsoft.Kubernetes",
     "clusterResourceName": "connectedClusters",
     "clusterName": "my-cluster",
     "publisherId": "myPublisherId",
     "offerId": "myOfferId",
     "planId": "myPlanId",
     "releaseTrain": "stable",
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {

diff --git a/...rnetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypesByLocation.json b/...rnetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypesByLocation.json
@@ -7,7 +7,7 @@
     "planId": "myPlanId",
     "clusterType": "connectedCluster",
     "releaseTrain": "stable",
-    "api-version": "2023-05-01"
+    "api-version": "2023-05-01-preview"
   },
   "responses": {
     "200": {

diff --git a/...-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/extensionTypes.json b/...-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/extensionTypes.json
@@ -107,7 +107,7 @@
             }
           }
         },
-        "x-ms-pagable": {
+        "x-ms-pageable": {
           "nextLinkName": "nextLink"
         }
       }
@@ -162,7 +162,7 @@
         }
       }
     },
-    "/subcriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions": {
       "get": {
         "tags": [
           "ExtensionTypes",
@@ -232,11 +232,11 @@
           }
         }
       },
-      "x-ms-pagable": {
+      "x-ms-pageable": {
         "nextLinkName": "nextLink"
       }
     },
-    "/subcriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
       "get": {
         "tags": [
           "ExtensionTypes",
@@ -296,7 +296,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes": {
       "get": {
         "tags": [
           "ExtensionTypes",
@@ -373,7 +373,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}": {
       "get": {
         "tags": [
           "ExtensionTypes",
@@ -432,7 +432,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions": {
       "get": {
         "tags": [
           "ExtensionTypes",
@@ -504,11 +504,11 @@
           }
         }
       },
-      "x-ms-pagable": {
+      "x-ms-pageable": {
         "nextLinkName": "nextLink"
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
       "get": {
         "tags": [
           "ExtensionTypes",
@@ -629,21 +629,7 @@
                   "type": "string"
                 },
                 "clusterScopeSettings": {
-                  "type": "object",
-                  "properties": {
-                    "properties": {
-                      "type": "object"
-                    },
-                    "id": {
-                      "type": "string"
-                    },
-                    "name": {
-                      "type": "string"
-                    },
-                    "type": {
-                      "type": "string"
-                    }
-                  }
+                  "$ref": "#/definitions/ClusterScopeSettings"
                 }
               }
             }
@@ -656,6 +642,32 @@
         }
       ]
     },
+    "ClusterScopeSettings": {
+      "type": "object",
+      "description": "Extension scope settings",
+      "properties": {
+        "properties": {
+          "type": "object",
+          "x-ms-client-flatten": true,
+          "description": "Extension scope settings",
+          "properties": {
+            "allowMultipleInstances": {
+              "type": "boolean",
+              "description": "Describes if multiple instances of the extension are allowed"
+            },
+            "defaultReleaseNamespace": {
+              "type": "string",
+              "description": "Default extension release namespace"
+            }
+          }
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
+        }
+      ]
+    },
     "ExtensionTypeVersionForReleaseTrain": {
       "description": "The Extension Type Version object.",
       "type": "object",
@@ -689,7 +701,7 @@
               "type": "array",
               "description": "A list of supported cluster types for this version of the Extension Type",
               "items": {
-                "description": "The indivual cluster type that is supported by this extension",
+                "description": "The individual cluster type that is supported by this extension",
                 "type": "string"
               }
             }