[multiapi combiner] fix api-version validation (Azure#30880)

* fix api-version validation

* review

* fix

* fix

---------

Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com>

Author: azure-sdk

tools/azure-sdk-tools/packaging_tools/multiapi_combiner.py

@@ -185,9 +185,9 @@ def decorator(self) -> str:
         # all of the api versions of the operation group
         # because the operation group handles first round of validation
         if self._need_method_api_version_check:
-            retval.append(f"        api_versions={self.api_versions},")
+            retval.append(f"       method_valid_on={self.api_versions},")
         if self._need_params_api_version_check:
-            retval.append("        params={")
+            retval.append("        params_valid_on={")
             retval.extend([f'            "{p.name}": {p.api_versions},' for p in self.parameters if p.need_decorator])
             retval.append("        }")
         retval.append("    )")
@@ -259,7 +259,7 @@ def need_decorator(self) -> bool:
 
     @property
     def decorator(self) -> str:
-        return "\n".join(["@api_version_validation(", f"    api_versions={self.api_versions}", ")"])
+        return "\n".join(["@api_version_validation(", f"    method_valid_on={self.api_versions}", ")"])
 
     def combine_operations(self) -> None:
         api_versions = [v for v in self.code_model.sorted_api_versions if v in self.api_versions]

tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/validation.py.jinja2

@@ -1,53 +1,48 @@
-
-
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-from typing import Optional, Dict, List
+import functools
 
 
-class api_version_validation:
-    def __init__(
-        self,
-        *,
-        api_versions: Optional[List[str]] = None,
-        params: Optional[Dict[str, List[str]]] = None,
-    ):
-        self.api_versions = api_versions or []
-        self.params = params or {}
+def api_version_validation(**kwargs):
+    params_valid_on = kwargs.pop("params_valid_on", {})
+    method_valid_on = kwargs.pop("method_valid_on", {})
 
-    def __call__(self, func):
-        api_versions = self.api_versions
-        params = self.params
-        def wrapper(self, *args, **kwargs):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
             func_name = func.__name__
-            if hasattr(self, "_get_api_version"):
-                client_api_version = self._get_api_version(func_name)
-            else:
-                client_api_version = self._api_version
-            if api_versions and client_api_version not in api_versions:
+            try:
+                client_api_version = client._get_api_version(func_name)  # pylint: disable=protected-access
+            except AttributeError:
+                client_api_version = client._api_version
+
+            if client_api_version not in method_valid_on:
                 raise ValueError(
                     f"'{func_name}' is not available in API version "
-                    f"{client_api_version}. Pass service API version {api_versions[0]} or newer to your client."
+                    f"{client_api_version}. All valid API version are {', '.join(method_valid_on)}."
                 )
-            unsupported = [
-                parameter
-                for parameter, api_versions in params.items()
+
+            unsupported = {
+                parameter: ", ".join(api_versions)
+                for parameter, api_versions in params_valid_on.items()
                 if parameter in kwargs and client_api_version not in api_versions
-            ]
+            }
             if unsupported:
                 raise ValueError(
                     "".join(
                         [
                             f"'{param}' is not available in API version {client_api_version}. "
-                            f"Use service API version {params[param][0]} or newer.\n"
-                            for param, version in unsupported
+                            f"All valid API version are {versions} \n"
+                            for param, versions in unsupported.items()
                         ]
                     )
                 )
-            return func(self, *args, **kwargs)
+            return func(*args, **kwargs)
 
         return wrapper
+
+    return decorator