fix: containerservice-fleet - add pagination queryparams

specification/containerservice/Fleet.Management/fleet.tsp

@@ -10,7 +10,6 @@ using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using Azure.ResourceManager;
 using Azure.Core;
-using Azure.Core.Traits;
 using TypeSpec.OpenAPI;
 
 namespace Microsoft.ContainerService;
@@ -258,7 +257,10 @@ interface Fleets {
   listByResourceGroup is ArmResourceListByParent<Fleet>;
 
   @doc("Lists fleets in the specified subscription.")
-  listBySubscription is ArmListBySubscription<Fleet>;
+  listBySubscription is ArmListBySubscription<
+    Fleet,
+    Parameters = TopQueryParameter & SkipTokenQueryParameter
+  >;
 
   @doc("Lists the user credentials of a Fleet.")
   listCredentials is ArmResourceActionSync<Fleet, void, FleetCredentialResults>;

specification/containerservice/Fleet.Management/fleetmember.tsp

@@ -153,5 +153,10 @@ interface FleetMembers {
   >;
 
   /** List FleetMember resources by Fleet */
-  listByFleet is ArmResourceListByParent<FleetMember>;
+  listByFleet is ArmResourceListByParent<
+    FleetMember,
+    Parameters = TopQueryParameter &
+      SkipTokenQueryParameter &
+      FilterQueryParameter
+  >;
 }

specification/containerservice/Fleet.Management/gate.tsp

@@ -6,7 +6,6 @@ using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using Azure.Core;
 using Azure.ResourceManager;
-using TypeSpec.OpenAPI;
 
 namespace Microsoft.ContainerService;
 
@@ -196,5 +195,10 @@ interface Gates {
       IfNoneMatchParameters<Gate>
   >;
 
-  listByFleet is ArmResourceListByParent<Gate>;
+  listByFleet is ArmResourceListByParent<
+    Gate,
+    Parameters = FilterQueryParameter &
+      TopQueryParameter &
+      SkipTokenQueryParameter
+  >;
 }

specification/containerservice/Fleet.Management/helpers.tsp

@@ -3,7 +3,6 @@ import "@typespec/rest";
 using TypeSpec.OpenAPI;
 using TypeSpec.Http;
 using TypeSpec.Rest;
-using TypeSpec.Versioning;
 using Azure.ResourceManager;
 using Azure.ResourceManager.Foundations;
 
@@ -27,6 +26,27 @@ alias IfMatchHeadersParameters<T extends Azure.ResourceManager.Foundations.Resou
   ...IfNoneMatchParameters<T>;
 };
 
+@doc("Provides the standard '$skiptoken' query parameter for list operations.")
+model SkipTokenQueryParameter {
+  @query("$skipToken")
+  @doc("The page-continuation token to use with a paged version of this API.")
+  skipToken?: string;
+}
+
+@doc("Provides the standard '$top' query parameter for list operations.")
+model TopQueryParameter {
+  @query("$top")
+  @doc("The number of result items to return.")
+  top?: int32;
+}
+
+@doc("Provides the standard '$filter' query parameter for list operations.")
+model FilterQueryParameter {
+  @query("$filter")
+  @doc("Filter the result list using the given expression.")
+  filter?: string;
+}
+
 #suppress "@azure-tools/cadl-azure-resource-manager/arm-resource-operation-outside-interface" "this is a template"
 @autoRoute
 @doc("Update a {name}", TResource)

specification/containerservice/Fleet.Management/update/autoupgradeprofile.tsp

@@ -12,8 +12,6 @@ using TypeSpec.Versioning;
 using Azure.ResourceManager;
 using Azure.ResourceManager.Foundations;
 using Azure.Core;
-using Azure.Core.Traits;
-using TypeSpec.OpenAPI;
 
 namespace Microsoft.ContainerService;
 
@@ -153,7 +151,10 @@ interface AutoUpgradeProfiles {
     BaseParameters<AutoUpgradeProfile> & IfMatchParameters<AutoUpgradeProfile>
   >;
 
-  listByFleet is ArmResourceListByParent<AutoUpgradeProfile>;
+  listByFleet is ArmResourceListByParent<
+    AutoUpgradeProfile,
+    Parameters = TopQueryParameter & SkipTokenQueryParameter
+  >;
 }
 
 @doc("AutoUpgradeProfileStatus is the status of an auto upgrade profile.")

specification/containerservice/Fleet.Management/update/run.tsp

@@ -9,7 +9,6 @@ using TypeSpec.Http;
 using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using Azure.ResourceManager;
-using TypeSpec.OpenAPI;
 
 namespace Microsoft.ContainerService;
 
@@ -426,7 +425,10 @@ interface UpdateRuns {
   >;
 
   /** List UpdateRun resources by Fleet */
-  listByFleet is ArmResourceListByParent<UpdateRun>;
+  listByFleet is ArmResourceListByParent<
+    UpdateRun,
+    Parameters = TopQueryParameter & SkipTokenQueryParameter
+  >;
 
   #suppress "@azure-tools/typespec-azure-resource-manager/arm-post-operation-response-codes" "Existing API"
   @doc("Starts an UpdateRun.")

specification/containerservice/Fleet.Management/update/strategy.tsp

@@ -9,8 +9,6 @@ using TypeSpec.Http;
 using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using Azure.ResourceManager;
-using Azure.Core;
-using Azure.Core.Traits;
 using TypeSpec.OpenAPI;
 
 namespace Microsoft.ContainerService;
@@ -79,5 +77,8 @@ interface FleetUpdateStrategies {
   >;
 
   /** List FleetUpdateStrategy resources by Fleet */
-  listByFleet is ArmResourceListByParent<FleetUpdateStrategy>;
+  listByFleet is ArmResourceListByParent<
+    FleetUpdateStrategy,
+    Parameters = TopQueryParameter & SkipTokenQueryParameter
+  >;
 }

specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2022-09-02-preview/fleets.json

@@ -99,6 +99,12 @@
           },
           {
             "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
           }
         ],
         "responses": {
@@ -517,6 +523,15 @@
             "minLength": 1,
             "maxLength": 63,
             "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/FilterQueryParameter"
           }
         ],
         "responses": {
@@ -1092,5 +1107,34 @@
       "readOnly": true
     }
   },
-  "parameters": {}
+  "parameters": {
+    "FilterQueryParameter": {
+      "name": "$filter",
+      "in": "query",
+      "description": "Filter the result list using the given expression.",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "filter"
+    },
+    "SkipTokenQueryParameter": {
+      "name": "$skipToken",
+      "in": "query",
+      "description": "The page-continuation token to use with a paged version of this API.",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "skipToken"
+    },
+    "TopQueryParameter": {
+      "name": "$top",
+      "in": "query",
+      "description": "The number of result items to return.",
+      "required": false,
+      "type": "integer",
+      "format": "int32",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "top"
+    }
+  }
 }

specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-03-15-preview/fleets.json

@@ -102,6 +102,12 @@
           },
           {
             "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
           }
         ],
         "responses": {
@@ -520,6 +526,15 @@
             "minLength": 1,
             "maxLength": 63,
             "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/FilterQueryParameter"
           }
         ],
         "responses": {
@@ -887,6 +902,12 @@
             "minLength": 1,
             "maxLength": 63,
             "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
           }
         ],
         "responses": {
@@ -2092,5 +2113,34 @@
       }
     }
   },
-  "parameters": {}
+  "parameters": {
+    "FilterQueryParameter": {
+      "name": "$filter",
+      "in": "query",
+      "description": "Filter the result list using the given expression.",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "filter"
+    },
+    "SkipTokenQueryParameter": {
+      "name": "$skipToken",
+      "in": "query",
+      "description": "The page-continuation token to use with a paged version of this API.",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "skipToken"
+    },
+    "TopQueryParameter": {
+      "name": "$top",
+      "in": "query",
+      "description": "The number of result items to return.",
+      "required": false,
+      "type": "integer",
+      "format": "int32",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "top"
+    }
+  }
 }

specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-06-15-preview/fleets.json

@@ -102,6 +102,12 @@
           },
           {
             "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
           }
         ],
         "responses": {
@@ -538,6 +544,15 @@
             "minLength": 1,
             "maxLength": 63,
             "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/FilterQueryParameter"
           }
         ],
         "responses": {
@@ -923,6 +938,12 @@
             "minLength": 1,
             "maxLength": 63,
             "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+          },
+          {
+            "$ref": "#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "#/parameters/SkipTokenQueryParameter"
           }
         ],
         "responses": {
@@ -2301,5 +2322,34 @@
       }
     }
   },
-  "parameters": {}
+  "parameters": {
+    "FilterQueryParameter": {
+      "name": "$filter",
+      "in": "query",
+      "description": "Filter the result list using the given expression.",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "filter"
+    },
+    "SkipTokenQueryParameter": {
+      "name": "$skipToken",
+      "in": "query",
+      "description": "The page-continuation token to use with a paged version of this API.",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "skipToken"
+    },
+    "TopQueryParameter": {
+      "name": "$top",
+      "in": "query",
+      "description": "The number of result items to return.",
+      "required": false,
+      "type": "integer",
+      "format": "int32",
+      "x-ms-parameter-location": "method",
+      "x-ms-client-name": "top"
+    }
+  }
 }