feat: Improve based on review comments

Author: joaopalet

scripts/lint-golangci-lint.sh

@@ -28,15 +28,21 @@ else
     exit 1
 fi
 
-# If a service is specified, only lint that service
-if [ ! -z "${SERVICE}" ]; then
-    echo ">> Linting service ${SERVICE}"
-    cd ${SERVICES_PATH}/${SERVICE}
+lint_service() {
+    service=$1
+
+    echo ">> Linting service ${service}"
+    cd ${SERVICES_PATH}/${service}
     if [ "${SKIP_NON_GENERATED_FILES}" = true ]; then
         golangci-lint run ${GOLANG_CI_ARGS} --skip-dirs wait # All manually maintained files are in subfolders
     else
         golangci-lint run ${GOLANG_CI_ARGS}
     fi
+}
+
+# If a service is specified, only lint that service
+if [ ! -z "${SERVICE}" ]; then
+    lint_service ${SERVICE}
 # Otherwise, lint all modules and examples
 else
     if [ "${SKIP_NON_GENERATED_FILES}" = false ]; then
@@ -47,13 +53,7 @@ else
 
     for service_dir in ${SERVICES_PATH}/*; do
         service=$(basename ${service_dir})
-        echo ">> Linting service ${service}"
-        cd ${service_dir}
-        if [ "${SKIP_NON_GENERATED_FILES}" = true ]; then
-            golangci-lint run ${GOLANG_CI_ARGS} --skip-dirs wait # All manually maintained files are in subfolders
-        else
-            golangci-lint run ${GOLANG_CI_ARGS}
-        fi
+        lint_service ${service}
     done
 
     if [ "${SKIP_NON_GENERATED_FILES}" = false ]; then

scripts/test-go.sh

@@ -25,23 +25,25 @@ else
     exit 1
 fi
 
-# If a service is specified, only test that service
-if [ ! -z "${SERVICE}" ]; then
-    echo ">> Testing services/${SERVICE}"
-    cd ${SERVICES_PATH}/${SERVICE}
+test_service() {
+    service=$1
+
+    echo ">> Testing services/${service}"
     if [ "${SKIP_NON_GENERATED_FILES}" = true ]; then
-        go test ./ ${GOTEST_ARGS} # All manually maintained files are in subfolders
+        go test ${SERVICES_PATH}/${service}/... ${GOTEST_ARGS} # All manually maintained files are in subfolders
     else
-        go test ./... ${GOTEST_ARGS}
+        go test ${SERVICES_PATH}/${service}/... ${GOTEST_ARGS}
     fi
-    exit 0
-# Otherwise, test all modules
-else
+}
 
+# If a service is specified, only test that service
+if [ ! -z "${SERVICE}" ]; then
+    test_service ${SERVICE}
+# Otherwise, test all services and core
+else
     if [ "${SKIP_NON_GENERATED_FILES}" = false ]; then
         echo ">> Testing core"
-        cd ${CORE_PATH}
-        go test ./... ${GOTEST_ARGS}
+        go test ${CORE_PATH}/... ${GOTEST_ARGS}
     fi
 
     for service_dir in ${SERVICES_PATH}/*; do
@@ -54,12 +56,6 @@ else
             continue
         fi
 
-        echo ">> Testing services/${service}"
-        cd ${service_dir}
-        if [ "${SKIP_NON_GENERATED_FILES}" = true ]; then
-            go test ./ ${GOTEST_ARGS} # All manually maintained files are in subfolders
-        else
-            go test ./... ${GOTEST_ARGS}
-        fi
+        test_service ${service}
     done
 fi