mgmt self-serve, support api-version and sdkReleaseType (Azure#44900)

* script

* black

* fix sdk automation autorest

* bring back sdk_version

Author: XiaofeiCao

eng/automation/generate.py

@@ -118,6 +118,9 @@ def sdk_automation(input_file: str, output_file: str):
         # autorest
         if not packages:
             packages = sdk_automation_autorest(config)
+    except ValueError:
+        logging.error("[VALIDATION] Parameter validation failed.", exc_info=True)
+        sys.exit(1)
     except Exception:
         logging.error("[GENERATE] Code generation failed. Unknown exception", exc_info=True)
         if packages and len(packages) == 1:
@@ -190,8 +193,8 @@ def sdk_automation_autorest(config: dict) -> List[dict]:
                 tag=tag,
             )
             if succeeded:
-                compile_succeeded = compile_arm_package(sdk_root, module)
-                if compile_succeeded:
+                succeeded = compile_arm_package(sdk_root, module)
+                if succeeded:
                     stable_version = get_latest_ga_version(GROUP_ID, module, stable_version)
                     breaking, changelog, breaking_change_items = compare_with_maven_package(
                         sdk_root, GROUP_ID, service, stable_version, current_version, module
@@ -208,8 +211,12 @@ def sdk_automation_autorest(config: dict) -> List[dict]:
                         "pom.xml",
                     ],
                     "readmeMd": [readme],
-                    "artifacts": ["{0}/pom.xml".format(output_folder)]
-                    + [jar for jar in glob.glob("{0}/target/*.jar".format(output_folder))] if succeeded else [],
+                    "artifacts": (
+                        ["{0}/pom.xml".format(output_folder)]
+                        + [jar for jar in glob.glob("{0}/target/*.jar".format(output_folder))]
+                        if succeeded
+                        else []
+                    ),
                     "apiViewArtifact": next(iter(glob.glob("{0}/target/*-sources.jar".format(output_folder))), None),
                     "language": "Java",
                     "result": "succeeded" if succeeded else "failed",
@@ -250,19 +257,43 @@ def sdk_automation_typespec(config: dict) -> List[dict]:
     return packages
 
 
+def verify_self_serve_parameters(api_version, sdk_release_type):
+    if sdk_release_type and sdk_release_type not in ["stable", "beta"]:
+        raise ValueError(f"Invalid SDK release type [{sdk_release_type}], only support 'stable' or 'beta'.")
+    if api_version and sdk_release_type:
+        if api_version.endswith("-preview") and sdk_release_type == "stable":
+            raise ValueError(f"SDK release type is [stable], but API version [{api_version}] is preview.")
+        logging.info(f"[SelfServe] Generate with apiVersion: {api_version} and sdkReleaseType: {sdk_release_type}")
+    elif api_version or sdk_release_type:
+        raise ValueError("Both [API version] and [SDK release type] parameters are required for self-serve SDK generation.")
+
+
 def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
 
     base_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
     sdk_root = os.path.abspath(os.path.join(base_dir, SDK_ROOT))
     spec_root = os.path.abspath(config["specFolder"])
     head_sha: str = config["headSha"]
     repo_url: str = config["repoHttpsUrl"]
+    sdk_release_type: str = config["sdkReleaseType"] if "sdkReleaseType" in config else None
+    api_version = config["apiVersion"] if "apiVersion" in config else None
+    release_beta_sdk: bool = not sdk_release_type or sdk_release_type == "beta"
     breaking: bool = False
     changelog = ""
     breaking_change_items = []
 
+    verify_self_serve_parameters(api_version, sdk_release_type)
+
     succeeded, require_sdk_integration, sdk_folder, service, module = generate_typespec_project(
-        tsp_project, sdk_root, spec_root, head_sha, repo_url, remove_before_regen=True, group_id=GROUP_ID
+        tsp_project,
+        sdk_root,
+        spec_root,
+        head_sha,
+        repo_url,
+        remove_before_regen=True,
+        group_id=GROUP_ID,
+        api_version=api_version,
+        generate_beta_sdk=release_beta_sdk
     )
 
     if succeeded:
@@ -271,7 +302,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
             update_service_files_for_new_lib(sdk_root, service, GROUP_ID, module)
             update_root_pom(sdk_root, service)
 
-        stable_version, current_version = set_or_increase_version(sdk_root, GROUP_ID, module)
+        stable_version, current_version = set_or_increase_version(sdk_root, GROUP_ID, module, preview=release_beta_sdk)
         update_parameters(None)
         output_folder = OUTPUT_FOLDER_FORMAT.format(service)
         update_version(sdk_root, output_folder)
@@ -286,7 +317,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
                 service,
                 get_latest_ga_version(GROUP_ID, module, stable_version),
                 current_version,
-                module
+                module,
             )
             logging.info("[Changelog] Complete breaking change detection for SDK automation.")
             logging.info("[Changelog] Start generating changelog.")
@@ -296,7 +327,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
                 service,
                 get_latest_release_version(stable_version, current_version),
                 current_version,
-                module
+                module,
             )
             update_changelog_version(sdk_root, output_folder, current_version)
             logging.info("[Changelog] Complete generating changelog.")

eng/automation/generate_utils.py

@@ -20,7 +20,7 @@
 from utils import update_root_pom
 from utils import update_version
 from utils import is_windows
-from utils import set_or_default_version
+from utils import set_or_increase_version
 
 os.chdir(pwd)
 
@@ -334,7 +334,9 @@ def generate_typespec_project(
     repo_url: str = "",
     remove_before_regen: bool = False,
     group_id: str = None,
-    version: str = None,
+    api_version: str = None,
+    generate_beta_sdk: bool = True,
+    version: str = None, # SDK version
     **kwargs,
 ):
 
@@ -366,7 +368,7 @@ def generate_typespec_project(
                 tsp_project,
             ]
         else:
-            # sdk automation
+            # sdk automation/self serve
             tsp_dir = os.path.join(spec_root, tsp_project) if spec_root else tsp_project
             tspconfig_valid = validate_tspconfig(tsp_dir)
             repo = remove_prefix(repo_url, "https://github.com/")
@@ -414,9 +416,13 @@ def generate_typespec_project(
                     # clear existing generated source code, and regenerate
                     drop_changes(sdk_root)
                     remove_generated_source_code(sdk_folder, f"{group_id}.{service}")
-                    _, current_version = set_or_default_version(sdk_root, group_id, module, version=version)
+                    _, current_version = set_or_increase_version(sdk_root, group_id, module, version=version, preview = generate_beta_sdk)
                     tsp_cmd.append("--emitter-options")
-                    tsp_cmd.append(f'package-version={current_version}')
+                    emitter_options = f'package-version={current_version}'
+                    # currently for self-serve, may also need it in regular generation
+                    if api_version:
+                        emitter_options += f';api-version={api_version}'
+                    tsp_cmd.append(emitter_options)
                     # regenerate
                     check_call(tsp_cmd, sdk_root)
                 succeeded = True

eng/automation/utils.py

@@ -352,17 +352,13 @@ def set_or_increase_version(
 
     # 1.0.0-beta.1 -> [1,0,0,"-beta.1"]
     current_versions = list(re.findall(version_pattern, current_version)[0])
-    # 1.0.0 -> [(1,0,0,"")]
-    # 1.0.0-beta.1 -> [(1,0,0,"-beta.1")]
-    stable_versions = re.findall(version_pattern, stable_version)
-    # no stable version
-    if len(stable_versions) < 1 or stable_versions[0][-1] != "":
-        if not preview:
-            current_versions[-1] = ""
+    # if not preview, and version is not specified, set current version to be stable version
+    if not preview and not version:
+        current_versions[-1] = ""
         current_version = version_format.format(*current_versions)
         if not stable_version:
             stable_version = current_version
-        logging.info('[VERSION][Not Found] cannot find stable version, current version "{0}"'.format(current_version))
+        logging.info('[VERSION] stable release, auto-set current version to "{0}"'.format(current_version))
 
         write_version(version_file, lines, version_index, project, stable_version, current_version)
     else: