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..."
 
     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..."
 
     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

@@ -11,19 +11,19 @@ BRANCH_PREFIX=$1
 COMMIT_INFO=$2
 
 if [ $# -lt 2 ]; then
-    echo "Not enough arguments supplied. Required: 'branch-prefix' 'commit-info'"
+    echo "! Not enough arguments supplied. Required: 'branch-prefix' 'commit-info'"
     exit 1
 fi
 
 if type -p go >/dev/null; then
     :
 else
-    echo "Go not installed, unable to proceed."
+    echo "! Go not installed, unable to proceed."
     exit 1
 fi
 
 if [ ! -d ${SDK_REPO_LOCAL_PATH} ]; then
-    echo "sdk to commit not found in root. Please run make generate-sdk"
+    echo "! SDK to commit not found in root. Please run make generate-sdk"
     exit 1
 fi
 
@@ -48,7 +48,7 @@ if [[ ! ${work_dir} || -d {work_dir} ]]; then
 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,7 +60,7 @@ 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}"
 
@@ -80,6 +80,21 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
     service_changes=$(git status --porcelain "services/$service")
 
     if [[ -n "$service_changes" ]]; then
+        echo -e "\n>> Detected changes in $service service"
+
+        # If lint or test fails for a service, we skip it and continue to the next one
+        cd ${work_dir}/sdk_to_push
+        echo "## ls -la sdk_to_push: $(ls -la)"
+        make lint skip-non-generated-files=true service=$service || {
+            echo "! Linting failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
+            continue
+        }
+        make test skip-non-generated-files=true service=$service || {
+            echo "! Testing failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
+            continue
+        }
+        cd ${work_dir}/git_repo
+
         if [[ "$BRANCH_PREFIX" != "main" ]]; then
             git switch main # This is needed to create a new branch for the service without including the previously committed files
             branch="$BRANCH_PREFIX/$service"
@@ -99,25 +114,13 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
 
         if [[ "$branch" != "main" ]]; then
             echo ">> Creating PR for $service"
-
             git commit -m "Generate $service"
             git push origin "$branch"
             gh pr create --title "Generator: Update SDK /services/$service" --body "$COMMIT_INFO" --head "$branch" --base "main"
         else
             echo ">> Pushing changes for $service service..."
-
-            # 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"
-                continue
-            }
-            make test skip-non-generated-files=true service=$service || {
-                echo "! Testing failed for $service"
-                continue
-            }
-
-            git commit -m "Generate $service: $COMMIT_INFO"
-            git push origin "$branch"
+            # git commit -m "Generate $service: $COMMIT_INFO"
+            # git push origin "$branch"
         fi
     fi
 done