feat: Improvements

Author: joaopalet

scripts/download-oas.sh

@@ -33,7 +33,7 @@ fi
 # Move oas to root level
 mkdir ${ROOT_DIR}/oas
 cd ${work_dir}
-git clone ${OAS_REPO}
+git clone ${OAS_REPO} --quiet
 
 for service_dir in ${work_dir}/${OAS_REPO_NAME}/services/*; do
     max_version_dir=""

scripts/generate-sdk/generate-sdk.sh

@@ -74,21 +74,21 @@ fi
 # Generate SDK for the specified language
 case "${LANGUAGE}" in
 go)
-    echo -e "\nGenerating the Go SDK...\n"
+    echo -e "\n>> Generating the Go SDK...\n"
 
     source ${LANGUAGE_GENERATORS_FOLDER_PATH}/${LANGUAGE}.sh
     # Usage: generate_go_sdk GENERATOR_PATH GIT_HOST GIT_USER_ID [GIT_REPO_ID] [SDK_REPO_URL]
     generate_go_sdk ${jar_path} ${GIT_HOST} ${GIT_USER_ID} ${GIT_REPO_ID} ${SDK_REPO_URL}
     ;;
 python)
-    echo -e "\nGenerating the Python SDK...\n"
+    echo -e "\n>> Generating the Python SDK...\n"
 
     source ${LANGUAGE_GENERATORS_FOLDER_PATH}/${LANGUAGE}.sh
     # Usage: generate_python_sdk GENERATOR_PATH GIT_HOST GIT_USER_ID [GIT_REPO_ID] [SDK_REPO_URL]
     generate_python_sdk ${jar_path} ${GIT_HOST} ${GIT_USER_ID} ${GIT_REPO_ID} ${SDK_REPO_URL}
     ;;
 *)
-    echo "SDK language not supported."
+    echo "! SDK language not supported."
     exit 1
     ;;
 esac

scripts/generate-sdk/languages/go.sh

@@ -215,5 +215,4 @@ generate_go_sdk() {
     cd ${SDK_REPO_LOCAL_PATH}
     goimports -w ${SERVICES_FOLDER}/
     make sync-tidy
-
 }

scripts/sdk-create-pr.sh

@@ -41,14 +41,16 @@ else
 fi
 
 # Create temp directory to work on
-work_dir=$(mktemp -d)
+# work_dir=$(mktemp -d)
+work_dir="temp-dir"  # TODO: For testing only
+mkdir -p ${work_dir} # TODO: For testing only
 if [[ ! ${work_dir} || -d {work_dir} ]]; then
     echo "Unable to create temporary directory"
     exit 1
 fi
 
 # Delete temp directory on exit
-trap "rm -rf ${work_dir}" EXIT
+# trap "rm -rf ${work_dir}" EXIT
 
 mkdir ${work_dir}/git_repo    # Where the git repo will be created
 mkdir ${work_dir}/sdk_backup  # Backup of the SDK to check for new modules
@@ -60,11 +62,12 @@ rm -rf ${work_dir}/sdk_to_push/.git
 
 # Initialize git repo
 cd ${work_dir}/git_repo
-git clone ${REPO_URL_SSH} ./
+git clone ${REPO_URL_SSH} ./ --quiet
 git config user.name "${COMMIT_NAME}"
 git config user.email "${COMMIT_EMAIL}"
 
-cp -a . ${work_dir}/sdk_backup
+# cp -a . ${work_dir}/sdk_backup
+cp -a . ../${work_dir}/sdk_backup
 
 # Create PR for each new SDK module if there are changes
 for service_path in ${work_dir}/sdk_to_push/services/*; do
@@ -74,7 +77,7 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
     # Removal of pulled data is necessary because the old version may have files
     # that were deleted in the new version
     rm -rf ./services/$service/*
-    cp -a ${work_dir}/sdk_to_push/services/$service/. ./services/$service
+    cp -a ../${work_dir}/sdk_to_push/services/$service/. ./services/$service
 
     # Check for changes in the specific folder compared to main
     service_changes=$(git status --porcelain "services/$service")
@@ -89,13 +92,12 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
         fi
 
         git add services/${service}/
-        if [ "${LANGUAGE}" == "go" ] && [ ! -d "${work_dir}/sdk_backup/services/${service}/" ]; then # Check if it is a newly added SDK module
-            # go work use -r adds a use directive to the go.work file for dir, if it exists, and removes the use directory if the argument directory doesn’t exist
-            # the -r flag examines subdirectories of dir recursively
-            # this prevents errors if there is more than one new module in the SDK generation
-            go work use -r .
-            git add go.work
-        fi
+
+        # go work use -r adds a use directive to the go.work file for dir, if it exists, and removes the use directory if the argument directory doesn’t exist
+        # The -r flag examines subdirectories of dir recursively
+        # This prevents errors if there is more than one new module in the SDK generation
+        go work use -r services
+        git add go.work
 
         if [[ "$branch" != "main" ]]; then
             echo ">> Creating PR for $service"
@@ -108,16 +110,20 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
 
             # If lint or test fails for a service, we skip it and continue to the next one
             make lint skip-non-generated-files=true service=$service || {
-                echo "! Linting failed for $service"
+                echo "! Linting failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
                 continue
             }
+
+            echo ">> Adding $service to go.work..."
+            go work use -r services/$service
             make test skip-non-generated-files=true service=$service || {
-                echo "! Testing failed for $service"
+                echo "! Testing failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
                 continue
             }
 
-            git commit -m "Generate $service: $COMMIT_INFO"
-            git push origin "$branch"
+            echo ">> Actually pushing changes to main for $service service..."
+            # git commit -m "Generate $service: $COMMIT_INFO"
+            # git push origin "$branch"
         fi
     fi
 done