Skip to content

Commit ffdf566

Browse files
committed
Update Use environ.get instead of getattr(settings,)
Fix a typo Signed-off-by: ziad hany <ziadhany2016@gmail.com>
1 parent ee2d6e6 commit ffdf566

2 files changed

Lines changed: 10 additions & 26 deletions

File tree

scancodeio/settings.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -362,14 +362,3 @@
362362
FEDERATEDCODE_GIT_SERVICE_TOKEN = env.str("FEDERATEDCODE_GIT_SERVICE_TOKEN", default="")
363363
FEDERATEDCODE_GIT_SERVICE_NAME = env.str("FEDERATEDCODE_GIT_SERVICE_NAME", default="")
364364
FEDERATEDCODE_GIT_SERVICE_EMAIL = env.str("FEDERATEDCODE_GIT_SERVICE_EMAIL", default="")
365-
366-
# GrimoireLab integration
367-
368-
GRIMOIRELAB_METRICS_EXECUTABLE = env.str("GRIMOIRELAB_METRICS_EXECUTABLE", default="")
369-
GRIMOIRELAB_URL = env.str("GRIMOIRELAB_URL", default="")
370-
GRIMOIRELAB_USERNAME = env.str("GRIMOIRELAB_USERNAME", default="")
371-
GRIMOIRELAB_PASSWORD = env.str("GRIMOIRELAB_PASSWORD", default="")
372-
GRIMOIRELAB_OPENSEARCH_URL = env.str("GRIMOIRELAB_OPENSEARCH_URL", default="")
373-
GRIMOIRELAB_OPENSEARCH_INDEX = env.str("GRIMOIRELAB_OPENSEARCH_INDEX", default="")
374-
GRIMOIRELAB_OPENSEARCH_USERNAME = env.str("GRIMOIRELAB_OPENSEARCH_USERNAME", default="")
375-
GRIMOIRELAB_OPENSEARCH_PASSWORD = env.str("GRIMOIRELAB_OPENSEARCH_PASSWORD", default="")

scanpipe/pipelines/scan_repo_health.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,19 @@
2222
import json
2323
import subprocess
2424
import urllib.parse
25-
26-
from django.conf import settings
25+
from os import environ
2726

2827
from scanpipe.pipelines import Pipeline
2928
from scanpipe.pipes import run_command_safely
3029

31-
GRIMOIRELAB_METRICS_EXECUTABLE = getattr(settings, "GRIMOIRELAB_METRICS_EXECUTABLE", "")
32-
GRIMOIRELAB_OPENSEARCH_INDEX = getattr(settings, "GRIMOIRELAB_OPENSEARCH_INDEX", "")
33-
GRIMOIRELAB_OPENSEARCH_PASSWORD = getattr(
34-
settings, "GRIMOIRELAB_OPENSEARCH_PASSWORD", ""
35-
)
36-
GRIMOIRELAB_OPENSEARCH_URL = getattr(settings, "GRIMOIRELAB_OPENSEARCH_URL", "")
37-
GRIMOIRELAB_OPENSEARCH_USERNAME = getattr(
38-
settings, "GRIMOIRELAB_OPENSEARCH_USERNAME", ""
39-
)
40-
GRIMOIRELAB_PASSWORD = getattr(settings, "GRIMOIRELAB_PASSWORD", "")
41-
GRIMOIRELAB_URL = getattr(settings, "GRIMOIRELAB_URL", "")
42-
GRIMOIRELAB_USERNAME = getattr(settings, "GRIMOIRELAB_USERNAME", "")
30+
GRIMOIRELAB_METRICS_EXECUTABLE = environ.get("GRIMOIRELAB_METRICS_EXECUTABLE", "")
31+
GRIMOIRELAB_OPENSEARCH_INDEX = environ.get("GRIMOIRELAB_OPENSEARCH_INDEX", "")
32+
GRIMOIRELAB_OPENSEARCH_PASSWORD = environ.get("GRIMOIRELAB_OPENSEARCH_PASSWORD", "")
33+
GRIMOIRELAB_OPENSEARCH_URL = environ.get("GRIMOIRELAB_OPENSEARCH_URL", "")
34+
GRIMOIRELAB_OPENSEARCH_USERNAME = environ.get("GRIMOIRELAB_OPENSEARCH_USERNAME", "")
35+
GRIMOIRELAB_PASSWORD = environ.get("GRIMOIRELAB_PASSWORD", "")
36+
GRIMOIRELAB_URL = environ.get("GRIMOIRELAB_URL", "")
37+
GRIMOIRELAB_USERNAME = environ.get("GRIMOIRELAB_USERNAME", "")
4338

4439

4540
class ScanRepoHealth(Pipeline):
@@ -68,7 +63,7 @@ def get_availability(cls):
6863
and GRIMOIRELAB_URL
6964
and GRIMOIRELAB_USERNAME
7065
):
71-
return "Grimoirelab is not available."
66+
return "Grimoirelab is not configured."
7267

7368
def get_repo_url_input(self):
7469
"""Validate and extract the repository URL from the project's input sources"""

0 commit comments

Comments
 (0)