Skip to content

Commit fb4ed56

Browse files
committed
Drop go support from gitlab and github
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 33d9f18 commit fb4ed56

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

vulnerabilities/importers/github.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"COMPOSER": "composer",
126126
"PIP": "pypi",
127127
"RUBYGEMS": "gem",
128-
"GO": "golang",
128+
# "GO": "golang",
129129
}
130130

131131
GITHUB_ECOSYSTEM_BY_PACKAGE_TYPE = {

vulnerabilities/importers/gitlab.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,15 @@
6161

6262

6363
PURL_TYPE_BY_GITLAB_SCHEME = {
64+
# "conan": "conan",
6465
"gem": "gem",
65-
"go": "golang",
66+
# Entering issue to parse go package names https://github.com/nexB/vulnerablecode/issues/742
67+
# "go": "golang",
6668
"maven": "maven",
6769
"npm": "npm",
6870
"nuget": "nuget",
69-
"pypi": "pypi",
7071
"packagist": "composer",
71-
# "conan": "conan",
72+
"pypi": "pypi",
7273
}
7374

7475

@@ -125,7 +126,7 @@ def get_purl(package_slug):
125126
name = parts[1]
126127
return PackageURL(type=purl_type, name=name)
127128
# if package slug is of the form:
128-
# "nuget/github/user/abc/NuGet.Core"
129+
# "nuget/github.com/beego/beego/v2/nuget"
129130
if len(parts) >= 3:
130131
name = parts[-1]
131132
namespace = "/".join(parts[1:-1])
@@ -191,7 +192,7 @@ def parse_gitlab_advisory(file):
191192
urls = gitlab_advisory.get("urls")
192193
references = [Reference.from_url(u) for u in urls]
193194
date_published = dateparser.parse(gitlab_advisory.get("pubdate"))
194-
date_published = pytz.utc.localize(date_published)
195+
date_published = date_published.replace(tzinfo=pytz.UTC)
195196
package_slug = gitlab_advisory.get("package_slug")
196197
purl: PackageURL = get_purl(package_slug=package_slug)
197198
if not purl:

vulnerabilities/tests/test_gitlab.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
TEST_DATA = os.path.join(BASE_DIR, "test_data", "gitlab")
3737

3838

39-
@pytest.mark.parametrize("pkg_type", ["maven", "nuget", "gem", "golang", "composer", "pypi", "npm"])
39+
@pytest.mark.parametrize("pkg_type", ["maven", "nuget", "gem", "composer", "pypi", "npm"])
4040
def test_parse_yaml_file(pkg_type):
4141
response_file = os.path.join(TEST_DATA, f"{pkg_type}.yaml")
4242
expected_file = os.path.join(TEST_DATA, f"{pkg_type}-expected.json")
@@ -84,7 +84,7 @@ def valid_versions(pkg_type):
8484

8585

8686
@mock.patch("vulnerabilities.importers.gitlab.GitLabBasicImprover.get_package_versions")
87-
@pytest.mark.parametrize("pkg_type", ["maven", "nuget", "gem", "golang", "composer", "pypi", "npm"])
87+
@pytest.mark.parametrize("pkg_type", ["maven", "nuget", "gem", "composer", "pypi", "npm"])
8888
def test_gitlab_improver(mock_response, pkg_type):
8989
advisory_file = os.path.join(TEST_DATA, f"{pkg_type}-expected.json")
9090
expected_file = os.path.join(TEST_DATA, f"{pkg_type}-improver-expected.json")

0 commit comments

Comments
 (0)