ci: Move examples to tests and split SdMonitorclient into EventsClient's (#136)

Co-authored-by: Vicente Herrera <[email protected]>

Author: tembleking

.github/workflows/ci-pull-request.yml

@@ -19,8 +19,11 @@ jobs:
       run: python -m pip install pipenv
 
     - uses: actions/cache@v2
+      name: Cache Pipenv dependencies
       with:
-        path: ~/.cache
+        path: |
+          ~/.cache
+          ~/.local/share/virtualenvs/
         key: ${{ runner.os }}-pipenv-${{ hashFiles('**/Pipfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-pipenv-
@@ -47,20 +50,11 @@ jobs:
     - name: Travis Test - Install dependencies
       run: pip install .
 
-    - name: Travis Test - Monitor APIs
-      env:
-        PYTHON_SDC_TEST_MONITOR_API_TOKEN: ${{ secrets.STAGING_MONITOR_API_TOKEN }}
-      run: ./test/test_monitor_apis.sh
-
     - name: Travis Test - Secure APIs
       env:
         PYTHON_SDC_TEST_API_TOKEN: ${{ secrets.STAGING_SECURE_API_TOKEN }}
       run: ./test/test_secure_apis.sh
 
-    - name: Travis Test - Stop agent
-      run: ./test/stop_agent.sh
-      if: steps.start_agent.outcome == 'success'
-
     - name: Test in staging
       env:
         SDC_MONITOR_TOKEN: ${{ secrets.STAGING_MONITOR_API_TOKEN }}
@@ -69,3 +63,7 @@ jobs:
         SDC_SECURE_URL: "https://secure-staging.sysdig.com"
       run: |
         pipenv run mamba -f documentation
+
+    - name: Travis Test - Stop agent
+      run: ./test/stop_agent.sh
+      if: steps.start_agent.outcome == 'success'

.gitignore

@@ -64,3 +64,5 @@ venv/
 
 # IntelliJ projects
 .idea/
+
+coverage/

.travis.yml

@@ -0,0 +1,16 @@
+
+
+.PHONY: test
+test:
+	pipenv run mamba -f documentation
+
+.coverage:
+	pipenv run coverage run $(shell pipenv run which mamba) -f documentation || true
+
+cover: .coverage
+	pipenv run coverage report --include 'sdcclient/*'
+
+.PHONY: cover-html
+cover-html: .coverage
+	pipenv run coverage html -d coverage --include 'sdcclient/*'
+

Makefile

@@ -11,6 +11,7 @@ expects = "*"
 flake8 = "*"
 pipenv-setup = "*"
 sdcclient = {editable = true, path = "."}
+coverage = "*"
 
 [packages]
 requests = "*"

Pipfile

@@ -6,12 +6,14 @@
 import getopt
 import sys
 
-from sdcclient import SdcClient
-
+from sdcclient import SdcClient, SdMonitorClient
 
 #
 # Parse arguments
 #
+from sdcclient.monitor import EventsClientV2
+
+
 def usage():
     print(('usage: %s [-e|--event <name>] <sysdig-token>' % sys.argv[0]))
     print('-e|--event: Name of event to delete')
@@ -37,7 +39,7 @@ def usage():
 #
 # Instantiate the SDC client
 #
-sdclient = SdcClient(sdc_token)
+sdclient = SdMonitorClient(sdc_token)
 
 #
 # Get the events that match a name

Pipfile.lock

@@ -5,7 +5,7 @@
 
 import sys
 
-from sdcclient import SdcClient
+from sdcclient import SdMonitorClient
 
 
 def print_events(data):
@@ -29,7 +29,7 @@ def print_events(data):
 #
 # Instantiate the SDC client
 #
-sdclient = SdcClient(sdc_token)
+sdclient = SdMonitorClient(sdc_token)
 
 #
 # Get the entire list of events

examples/delete_event.py

@@ -7,7 +7,7 @@
 import json
 import sys
 
-from sdcclient import SdcClient
+from sdcclient import SdMonitorClient
 
 #
 # Parse arguments
@@ -33,7 +33,7 @@
 #
 # Instantiate the SDC client
 #
-sdclient = SdcClient(args.sysdig_token)
+sdclient = SdMonitorClient(args.sysdig_token)
 
 #
 # Post the event using post_event(self, name, description=None, severity=None, event_filter=None, tags=None)

examples/list_events.py

@@ -5,7 +5,7 @@
 
 import sys
 
-from sdcclient import SdcClient
+from sdcclient import SdMonitorClient
 
 #
 # Parse arguments
@@ -29,7 +29,7 @@
 #
 # Instantiate the SDC client
 #
-sdclient = SdcClient(sdc_token)
+sdclient = SdMonitorClient(sdc_token)
 
 #
 # Post the event