SDK automation, clean up the SDK folder, if it is conversion from Swagger to TypeSpec

eng/mgmt/automation/generate_data.py

@@ -17,7 +17,7 @@
 from utils import update_root_pom
 from utils import ListIndentDumper
 
-from generate_utils import generate_typespec_project
+from generate_utils import generate_typespec_project, clean_sdk_folder_if_swagger
 
 GROUP_ID = "com.azure"
 DPG_ARGUMENTS = "--sdk-integration --generate-samples --generate-tests"
@@ -35,6 +35,15 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
         tsp_project, sdk_root, spec_root, head_sha, repo_url
     )
 
+    if not succeeded:
+        # check whether this is migration from Swagger
+        clean_sdk_folder_succeeded = clean_sdk_folder_if_swagger(sdk_root, sdk_folder)
+        if clean_sdk_folder_succeeded:
+            # re-generate
+            succeeded, require_sdk_integration, sdk_folder, service, module = generate_typespec_project(
+                tsp_project, sdk_root, spec_root, head_sha, repo_url
+            )
+
     if succeeded:
         # TODO (weidxu): move to typespec-java
         if require_sdk_integration:
@@ -45,6 +54,21 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
         # compile
         succeeded = compile_package(sdk_root, GROUP_ID, module)
 
+        if not succeeded:
+            # check whether this is migration from Swagger
+            clean_sdk_folder_succeeded = clean_sdk_folder_if_swagger(sdk_root, sdk_folder)
+            if clean_sdk_folder_succeeded:
+                # re-generate
+                succeeded, require_sdk_integration, sdk_folder, service, module = generate_typespec_project(
+                    tsp_project, sdk_root, spec_root, head_sha, repo_url
+                )
+                if require_sdk_integration:
+                    set_or_default_version(sdk_root, GROUP_ID, module)
+                    update_service_ci_and_pom(sdk_root, service, GROUP_ID, module)
+                    update_root_pom(sdk_root, service)
+                # compile
+                succeeded = compile_package(sdk_root, GROUP_ID, module)
+
     # output
     if sdk_folder and module and service:
         artifacts = ["{0}/pom.xml".format(sdk_folder)]
@@ -238,7 +262,7 @@ def generate(
     autorest: str,
     use: str,
     autorest_options: str = "",
-    readme: str = None
+    readme: str = None,
 ) -> bool:
     namespace = "com.{0}".format(module.replace("-", "."))
     output_dir = os.path.join(sdk_root, "sdk", service, module)

eng/mgmt/automation/generate_utils.py

@@ -465,7 +465,28 @@ def find_sdk_folder(sdk_root: str):
         tsp_location_item: str = git_items[0]
         sdk_folder = tsp_location_item[1:].strip()[0 : -len("/tsp-location.yaml")]
 
-    cmd = ["git", "reset", "."]
+    cmd = ["git", "reset", ".", "-q"]
     check_call(cmd, sdk_root)
 
     return sdk_folder
+
+
+def clean_sdk_folder_if_swagger(sdk_root: str, sdk_folder: str) -> bool:
+    succeeded = False
+    # try to find the sdk_folder
+    if not sdk_folder:
+        sdk_folder = find_sdk_folder(sdk_root)
+    if sdk_folder:
+        sdk_path = os.path.join(sdk_root, sdk_folder)
+        # check whether this is migration from Swagger
+        if os.path.exists(os.path.join(sdk_path, "swagger")):
+            logging.info(f"[GENERATE] Delete folder: {sdk_folder}")
+            print(
+                "Existing package in SDK was from Swagger. It cannot be automatically converted to package from TypeSpec. Generate a fresh package from TypeSpec.",
+                file=sys.stderr,
+            )
+            # delete the folder
+            shutil.rmtree(sdk_path, ignore_errors=True)
+
+            succeeded = True
+    return succeeded