From a70aa892b8c2205425acdde08470cfc951d3ed20 Mon Sep 17 00:00:00 2001 From: surajswaminathan <133060392+surajswaminathan@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:09:38 -0700 Subject: [PATCH] Revert "squash (#169)" (#172) This reverts commit 3ffef3bd810b9cf1045074c6ad670f7d970b4f93. --- .github/workflows/python-test.yml | 2 +- laceworksdk/api/v2/vulnerabilities.py | 7 ------- tests/api/v2/test_vulnerabilities.py | 16 +--------------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index f969314..6d36672 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -56,7 +56,7 @@ jobs: LW_API_SECRET: ${{ secrets.LW_API_SECRET }} LW_BASE_DOMAIN: ${{ secrets.LW_BASE_DOMAIN }} - name: Report Status - if: github.ref_name == 'main' + if: contains(github.ref, "main") uses: ravsamhq/notify-slack-action@v2 with: status: ${{ job.status }} diff --git a/laceworksdk/api/v2/vulnerabilities.py b/laceworksdk/api/v2/vulnerabilities.py index ec23820..b57d8bc 100644 --- a/laceworksdk/api/v2/vulnerabilities.py +++ b/laceworksdk/api/v2/vulnerabilities.py @@ -42,7 +42,6 @@ def __init__(self, session): self.containers = self.ContainerVulnerabilitiesAPI(session, self._base_path) self.hosts = self.HostVulnerabilitiesAPI(session, self._base_path) self.packages = self.SoftwarePackagesAPI(session, self._base_path) - self.imageSummary = self.ImageSummaryVulnerabilitiesAPI(session, self._base_path) class ContainerVulnerabilitiesAPI(SearchEndpoint): """A class used to represent the Container Vulnerabilities API endpoint.""" @@ -91,12 +90,6 @@ def status(self, request_id): ) return response.json() - - class ImageSummaryVulnerabilitiesAPI(SearchEndpoint): - """A class used to represent the ImageSummary Vulnerabilities API endpoint.""" - - RESOURCE = "ImageSummary" - class HostVulnerabilitiesAPI(SearchEndpoint): """A class used to represent the Host Vulnerabilities API endpoint.""" diff --git a/tests/api/v2/test_vulnerabilities.py b/tests/api/v2/test_vulnerabilities.py index bca784a..b6c3142 100644 --- a/tests/api/v2/test_vulnerabilities.py +++ b/tests/api/v2/test_vulnerabilities.py @@ -23,8 +23,7 @@ class TestVulnerabilitesEndpoint(SearchEndpoint): OBJECT_TYPE = VulnerabilitiesAPI OBJECT_MAP = { "containers": VulnerabilitiesAPI.ContainerVulnerabilitiesAPI, - "hosts": VulnerabilitiesAPI.HostVulnerabilitiesAPI, - "imageSummary": VulnerabilitiesAPI.ImageSummaryVulnerabilitiesAPI + "hosts": VulnerabilitiesAPI.HostVulnerabilitiesAPI } def test_vulnerabilities_containers_api_scan(self, api_object, request): @@ -68,16 +67,3 @@ def test_vulnerabilities_packages_api_scan(api, api_object): "pkgVer": "1.1.1-1ubuntu2.1~20.04" }]) assert "data" in response.keys() - - def test_vulnerabilities_image_summary_search(api, api_object): - json = { - "timeFilter": { - "startTime": "2024-03-18T00:00:00Z", - "endTime": "2024-03-19T08:00:00Z" - }, - "filters" : [ - {"field": "ndvContainers", "expression": "gt", "value": 0} - ] - } - response = api_object.imageSummary.search(json) - assert "data" in next(response, None) \ No newline at end of file