okorach · okorach · Oct 6, 2024 · Oct 6, 2024 · Oct 6, 2024 · Oct 6, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install flake8 pylint bandit pytest coverage
+          pip install flake8 pylint pytest coverage
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
       #- name: Lint with flake8
       #  run: |
@@ -49,8 +49,8 @@ jobs:
       - name: Run linters
         working-directory: .
         run: |
-          chmod +x ./run_linters.sh
-          ./run_linters.sh
+          chmod +x conf/run_linters.sh
+          conf/run_linters.sh
       #- name: Cache SonarQube packages
       #  uses: actions/cache@v4
       #  with:

diff --git a/.sonarcloud.properties b/.sonarcloud.properties
diff --git a/.flake8 → conf/.flake8 b/.flake8 → conf/.flake8
diff --git a/deploy.bat → conf/deploy.bat b/deploy.bat → conf/deploy.bat
diff --git a/deploy.sh → conf/deploy.sh b/deploy.sh → conf/deploy.sh
@@ -19,6 +19,10 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
+ME="$( basename "${BASH_SOURCE[0]}" )"
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+CONFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 build_docs=1
 build_image=1
 release=0
@@ -44,30 +48,30 @@ while [ $# -ne 0 ]; do
 done
 
 black --line-length=150 .
-rm -rf build dist
-python3 setup.py bdist_wheel
+rm -rf $ROOTDIR/build/lib/sonar $ROOTDIR/build/lib/cli $ROOTDIR/build/scripts*/sonar-tools $ROOTDIR/dist/sonar_tools*
+python3 $ROOTDIR/setup.py bdist_wheel
 
 # Deploy locally for tests
-pip install --upgrade --force-reinstall dist/sonar_tools-*-py3-*.whl
+pip install --upgrade --force-reinstall $ROOTDIR/dist/sonar_tools-*-py3-*.whl
 
 if [ "$build_image" == "1" ]; then
-    docker build -t olivierkorach/sonar-tools:3.5 -t olivierkorach/sonar-tools:latest -f snapshot.Dockerfile . --load
+    docker build -t olivierkorach/sonar-tools:3.5 -t olivierkorach/sonar-tools:latest -f $CONFDIR/snapshot.Dockerfile $ROOTDIR --load
 fi
 
 if [ "$build_docs" == "1" ]; then
-    rm -rf api-doc/build
-    sphinx-build -b html api-doc/source api-doc/build
+    rm -rf doc/api/build
+    sphinx-build -b html doc/api/source doc/api/build
 fi
 
 # Deploy on pypi.org once released
 if [ "$release" = "1" ]; then
     echo "Confirm release [y/n] ?"
     read -r confirm
     if [ "$confirm" = "y" ]; then
-        python3 -m twine upload dist/sonar_tools-*-py3-*.whl
+        python3 -m twine upload $ROOTDIR/dist/sonar_tools-*-py3-*.whl
     fi
 fi
 
 if [ "$release_docker" = "1" ]; then
-    docker buildx build --push --platform linux/amd64,linux/arm64 -t olivierkorach/sonar-tools:3.5  -t olivierkorach/sonar-tools:latest -f release.Dockerfile .
+    docker buildx build --push --platform linux/amd64,linux/arm64 -t olivierkorach/sonar-tools:3.5  -t olivierkorach/sonar-tools:latest -f $ROOTDIR/release.Dockerfile .
 fi
diff --git a/pylintrc → conf/pylintrc b/pylintrc → conf/pylintrc
diff --git a/release.Dockerfile → conf/release.Dockerfile b/release.Dockerfile → conf/release.Dockerfile
diff --git a/run_linters.sh → conf/run_linters.sh b/run_linters.sh → conf/run_linters.sh
@@ -19,7 +19,11 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-buildDir="build"
+ME="$( basename "${BASH_SOURCE[0]}" )"
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+CONFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+buildDir="$ROOTDIR/build"
 pylintReport="$buildDir/pylint-report.out"
 # banditReport="$buildDir/bandit-report.json"
 flake8Report="$buildDir/flake8-report.out"
@@ -29,7 +33,7 @@ externalIssueReport="$buildDir/external-issue-report.json"
 
 echo "Running pylint"
 rm -f $pylintReport
-pylint ./*.py ./*/*.py -r n --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" | tee $pylintReport
+pylint --rcfile $CONFDIR/pylintrc $ROOTDIR/*.py $ROOTDIR/*/*.py -r n --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" | tee $pylintReport
 re=$?
 if [ "$re" == "32" ]; then
     >&2 echo "ERROR: pylint execution failed, errcode $re, aborting..."
@@ -39,11 +43,11 @@ fi
 echo "Running flake8"
 rm -f $flake8Report
 # See .flake8 file for settings
-flake8 . >$flake8Report
+flake8 --config "$CONFIG/.flake8" "$ROOTDIR" >$flake8Report
 
 # echo "Running bandit"
 # rm -f $banditReport
 # bandit --exit-zero -f json --skip B311,B303,B101 -r . -x .vscode,./tests >$banditReport
 
 echo "Running shellcheck"
-shellcheck ./*.sh ./*/*.sh -s bash -f json | ./shellcheck2sonar.py >$externalIssueReport
+shellcheck $ROOTDIR/*.sh $ROOTDIR/*/*.sh -s bash -f json | $CONFDIR/shellcheck2sonar.py >$externalIssueReport
diff --git a/run_tests.sh → conf/run_tests.sh b/run_tests.sh → conf/run_tests.sh
@@ -19,14 +19,18 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-buildDir="build"
+ME="$( basename "${BASH_SOURCE[0]}" )"
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+CONFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+buildDir="$ROOTDIR/build"
 coverageReport="$buildDir/coverage.xml"
 
 [ ! -d $buildDir ] && mkdir $buildDir
 
 echo "Running tests"
-chmod u-rw test/sif_not_readable.json
+unreadableSif=$ROOTDIR/test/sif_not_readable.json
+chmod u-rw $unreadableSif
 export SONAR_HOST_URL=${1:-${SONAR_HOST_URL_TEST}}
-coverage run --source=. -m pytest test/
+coverage run --source=$ROOTDIR -m pytest $ROOTDIR/test/
 coverage xml -o $coverageReport
-chmod u+rw test/sif_not_readable.json
+chmod u+rw $unreadableSif
diff --git a/scan.sh → conf/scan.sh b/scan.sh → conf/scan.sh
@@ -19,6 +19,10 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
+ME="$( basename "${BASH_SOURCE[0]}" )"
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+CONFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 dolint=true
 dotest=false
 
@@ -40,7 +44,7 @@ do
   shift
 done
 
-buildDir="build"
+buildDir="$ROOTDIR/build"
 pylintReport="$buildDir/pylint-report.out"
 banditReport="$buildDir/bandit-report.json"
 flake8Report="$buildDir/flake8-report.out"
@@ -51,14 +55,14 @@ externalIssuesReport="$buildDir/external-issue-report.json"
 rm -rf -- ${buildDir:?"."}/* .coverage */__pycache__ */*.pyc # mediatools/__pycache__  testpytest/__pycache__ testunittest/__pycache__
 
 if [ "$dotest" == "true" ]; then
-  ./run_tests.sh
+  $CONFDIR/run_tests.sh
 fi
 
 if [ "$dolint" != "false" ]; then
-  ./run_linters.sh
+  $CONFDIR/run_linters.sh
 fi
 
-version=$(grep PACKAGE_VERSION sonar/version.py | cut -d "=" -f 2 | sed -e "s/[\'\" ]//g" -e "s/^ +//" -e "s/ +$//")
+version=$(grep PACKAGE_VERSION $ROOTDIR/sonar/version.py | cut -d "=" -f 2 | sed -e "s/[\'\" ]//g" -e "s/^ +//" -e "s/ +$//")
 
 cmd="sonar-scanner -Dsonar.projectVersion=$version \
   -Dsonar.python.flake8.reportPaths=$flake8Report \

diff --git a/shellcheck2sonar.py → conf/shellcheck2sonar.py b/shellcheck2sonar.py → conf/shellcheck2sonar.py
diff --git a/snapshot.Dockerfile → conf/snapshot.Dockerfile b/snapshot.Dockerfile → conf/snapshot.Dockerfile
diff --git a/api-doc/Makefile → doc/api/Makefile b/api-doc/Makefile → doc/api/Makefile
diff --git a/api-doc/make.bat → doc/api/make.bat b/api-doc/make.bat → doc/api/make.bat
diff --git a/api-doc/source/aggregation_permissions.rst → doc/api/source/aggregation_permissions.rst b/api-doc/source/aggregation_permissions.rst → doc/api/source/aggregation_permissions.rst
diff --git a/api-doc/source/aggregations.rst → doc/api/source/aggregations.rst b/api-doc/source/aggregations.rst → doc/api/source/aggregations.rst
diff --git a/api-doc/source/application_permissions.rst → doc/api/source/application_permissions.rst b/api-doc/source/application_permissions.rst → doc/api/source/application_permissions.rst
diff --git a/api-doc/source/applications.rst → doc/api/source/applications.rst b/api-doc/source/applications.rst → doc/api/source/applications.rst
diff --git a/api-doc/source/branches.rst → doc/api/source/branches.rst b/api-doc/source/branches.rst → doc/api/source/branches.rst
diff --git a/api-doc/source/components.rst → doc/api/source/components.rst b/api-doc/source/components.rst → doc/api/source/components.rst
diff --git a/api-doc/source/conf.py → doc/api/source/conf.py b/api-doc/source/conf.py → doc/api/source/conf.py
diff --git a/api-doc/source/devops.rst → doc/api/source/devops.rst b/api-doc/source/devops.rst → doc/api/source/devops.rst
diff --git a/api-doc/source/findings.rst → doc/api/source/findings.rst b/api-doc/source/findings.rst → doc/api/source/findings.rst
diff --git a/api-doc/source/global_permissions.rst → doc/api/source/global_permissions.rst b/api-doc/source/global_permissions.rst → doc/api/source/global_permissions.rst
diff --git a/api-doc/source/groups.rst → doc/api/source/groups.rst b/api-doc/source/groups.rst → doc/api/source/groups.rst
diff --git a/api-doc/source/hotspots.rst → doc/api/source/hotspots.rst b/api-doc/source/hotspots.rst → doc/api/source/hotspots.rst
diff --git a/api-doc/source/index.rst → doc/api/source/index.rst b/api-doc/source/index.rst → doc/api/source/index.rst
diff --git a/api-doc/source/issues.rst → doc/api/source/issues.rst b/api-doc/source/issues.rst → doc/api/source/issues.rst
diff --git a/api-doc/source/languages.rst → doc/api/source/languages.rst b/api-doc/source/languages.rst → doc/api/source/languages.rst
diff --git a/api-doc/source/measures.rst → doc/api/source/measures.rst b/api-doc/source/measures.rst → doc/api/source/measures.rst
diff --git a/api-doc/source/metrics.rst → doc/api/source/metrics.rst b/api-doc/source/metrics.rst → doc/api/source/metrics.rst
diff --git a/api-doc/source/organizations.rst → doc/api/source/organizations.rst b/api-doc/source/organizations.rst → doc/api/source/organizations.rst
diff --git a/api-doc/source/permission_templates.rst → doc/api/source/permission_templates.rst b/api-doc/source/permission_templates.rst → doc/api/source/permission_templates.rst
diff --git a/api-doc/source/permissions.rst → doc/api/source/permissions.rst b/api-doc/source/permissions.rst → doc/api/source/permissions.rst
diff --git a/api-doc/source/platform.rst → doc/api/source/platform.rst b/api-doc/source/platform.rst → doc/api/source/platform.rst
diff --git a/api-doc/source/portfolio_permissions.rst → doc/api/source/portfolio_permissions.rst b/api-doc/source/portfolio_permissions.rst → doc/api/source/portfolio_permissions.rst
diff --git a/api-doc/source/portfolios.rst → doc/api/source/portfolios.rst b/api-doc/source/portfolios.rst → doc/api/source/portfolios.rst
diff --git a/api-doc/source/project_permissions.rst → doc/api/source/project_permissions.rst b/api-doc/source/project_permissions.rst → doc/api/source/project_permissions.rst
diff --git a/api-doc/source/projects.rst → doc/api/source/projects.rst b/api-doc/source/projects.rst → doc/api/source/projects.rst
diff --git a/api-doc/source/pullrequests.rst → doc/api/source/pullrequests.rst b/api-doc/source/pullrequests.rst → doc/api/source/pullrequests.rst
diff --git a/api-doc/source/quality_permissions.rst → doc/api/source/quality_permissions.rst b/api-doc/source/quality_permissions.rst → doc/api/source/quality_permissions.rst
diff --git a/api-doc/source/qualitygate_permissions.rst → doc/api/source/qualitygate_permissions.rst b/api-doc/source/qualitygate_permissions.rst → doc/api/source/qualitygate_permissions.rst
diff --git a/api-doc/source/qualitygates.rst → doc/api/source/qualitygates.rst b/api-doc/source/qualitygates.rst → doc/api/source/qualitygates.rst
diff --git a/...doc/source/qualityprofile_permissions.rst → ...api/source/qualityprofile_permissions.rst b/...doc/source/qualityprofile_permissions.rst → ...api/source/qualityprofile_permissions.rst
diff --git a/api-doc/source/qualityprofiles.rst → doc/api/source/qualityprofiles.rst b/api-doc/source/qualityprofiles.rst → doc/api/source/qualityprofiles.rst
diff --git a/api-doc/source/rules.rst → doc/api/source/rules.rst b/api-doc/source/rules.rst → doc/api/source/rules.rst
diff --git a/api-doc/source/sq_object.rst → doc/api/source/sq_object.rst b/api-doc/source/sq_object.rst → doc/api/source/sq_object.rst
diff --git a/api-doc/source/tasks.rst → doc/api/source/tasks.rst b/api-doc/source/tasks.rst → doc/api/source/tasks.rst
diff --git a/api-doc/source/tokens.rst → doc/api/source/tokens.rst b/api-doc/source/tokens.rst → doc/api/source/tokens.rst
diff --git a/api-doc/source/users.rst → doc/api/source/users.rst b/api-doc/source/users.rst → doc/api/source/users.rst
diff --git a/api-doc/source/webhooks.rst → doc/api/source/webhooks.rst b/api-doc/source/webhooks.rst → doc/api/source/webhooks.rst
diff --git a/migration.Dockerfile b/migration.Dockerfile
diff --git a/migration/deploy.sh b/migration/deploy.sh
@@ -19,6 +19,10 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
+ME="$( basename "${BASH_SOURCE[0]}" )"
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+CONFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 build_image=1
 release=0
 
@@ -40,25 +44,25 @@ while [ $# -ne 0 ]; do
 done
 
 black --line-length=150 .
-rm -rf build dist
-python3 setup_migration.py bdist_wheel
+rm -rf $ROOTDIR/build/lib/migration $ROOTDIR/build/lib/cli $ROOTDIR/build/lib/sonar $ROOTDIR/build/scripts*/sonar_migration $ROOTDIR/dist/sonar_migration*
+python3 $ROOTDIR/setup_migration.py bdist_wheel
 
 # Deploy locally for tests
-pip install --upgrade --force-reinstall dist/sonar_migration-*-py3-*.whl
+pip install --upgrade --force-reinstall $ROOTDIR/dist/sonar_migration-*-py3-*.whl
 
 if [ "$build_image" == "1" ]; then
-    docker build -t olivierkorach/sonar-migration:latest -f migration/snapshot.Dockerfile . --load
+    docker build -t olivierkorach/sonar-migration:latest -f migration/snapshot.Dockerfile $ROOTDIR --load
 fi
 
 # Deploy on pypi.org once released
 if [ "$release" = "1" ]; then
     echo "Confirm release [y/n] ?"
     read -r confirm
     if [ "$confirm" = "y" ]; then
-        python3 -m twine upload dist/sonar_migration-*-py3-*.whl
+        python3 -m twine upload $ROOTDIR/dist/sonar_migration-*-py3-*.whl
     fi
 fi
 
 if [ "$release_docker" = "1" ]; then
-    docker buildx build --push --platform linux/amd64,linux/arm64 -t olivierkorach/sonar-migration:0.3  -t olivierkorach/sonar-migration:latest -f migration/release.Dockerfile .
+    docker buildx build --push --platform linux/amd64,linux/arm64 -t olivierkorach/sonar-migration:0.3  -t olivierkorach/sonar-migration:latest -f migration/release.Dockerfile $ROOTDIR
 fi
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -12,7 +12,7 @@ sonar.python.flake8.reportPaths=build/flake8-report.out
 sonar.python.pylint.reportPaths=build/pylint-report.out
 # sonar.python.bandit.reportPaths=build/bandit-report.json
 
-sonar.exclusions=api-doc/**/*, build/**/*, test/**/*
-sonar.coverage.exclusions=setup*.py, migration/migration.py, test/**/*, shellcheck2sonar.py, cli/cust_measures.py, sonar/custom_measures.py, cli/support.py, cli/projects_export.py, , cli/projects_import.py
+sonar.exclusions=doc/api/**/*, build/**/*, test/**/*
+sonar.coverage.exclusions=setup*.py, migration/migration.py, test/**/*, conf/shellcheck2sonar.py, cli/cust_measures.py, sonar/custom_measures.py, cli/support.py, cli/projects_export.py, cli/projects_import.py
 sonar.cpd.exclusions=setup*.py, migration/migration.py
 sonar.tests=test
diff --git a/sonar/platform.py b/sonar/platform.py
@@ -222,6 +222,7 @@ def __run_request(
             headers["Authorization"] = f"Bearer {self.__token}"
             if kwargs.get("with_organization", True):
                 params["organization"] = self.organization
+        req_type, url = "", ""
         if log.get_level() >= logging.DEBUG:
             req_type = getattr(request, "__name__", repr(request)).upper()
             url = self.__urlstring(api, params)