Merge pull request #76 from CiscoSecurity/release-2.0.3

Release 2.0.3

Author: oshynk

code/api/enrich.py

@@ -434,12 +434,6 @@ def format_docs(docs):
     return {'count': len(docs), 'docs': docs}
 
 
-@enrich_api.route('/deliberate/observables', methods=['POST'])
-def deliberate_observables():
-    # Not implemented
-    return jsonify_data({})
-
-
 @enrich_api.route('/observe/observables', methods=['POST'])
 def observe_observables():
     relay_input = get_observables()

code/api/respond.py

@@ -2,7 +2,6 @@
 
 from api.enrich import enrich_api
 from api.health import health_api
-from api.respond import respond_api
 from api.watchdog import watchdog_api
 from api.version import version_api
 
@@ -17,7 +16,6 @@
 
 app.register_blueprint(health_api)
 app.register_blueprint(enrich_api)
-app.register_blueprint(respond_api)
 app.register_blueprint(watchdog_api)
 app.register_blueprint(version_api)
 

code/app.py

@@ -1,4 +1,4 @@
 {
-  "VERSION": "2.0.2",
+  "VERSION": "2.0.3",
   "NAME": "Pulsedive"
 }

code/container_settings.json

@@ -62,9 +62,6 @@ def pd_api_response(ok, payload=None, reason=''):
 def expected_payload(any_route):
     payload = None
 
-    if any_route.startswith('/deliberate'):
-        payload = {}
-
     if any_route.startswith('/observe'):
         payload = EXPECTED_PAYLOAD_OBSERVE
 
@@ -99,7 +96,6 @@ def test_enrich_call_without_jwt_failure(route,
 
 
 def all_routes():
-    yield '/deliberate/observables'
     yield '/observe/observables'
     yield '/refer/observables'
 

code/tests/unit/api/test_enrich.py

@@ -16,11 +16,8 @@ def calls():
     yield Call('GET', '/health', HTTPStatus.METHOD_NOT_ALLOWED)
     yield Call('GET', '/version', HTTPStatus.METHOD_NOT_ALLOWED)
     yield Call('POST', '/watchdog', HTTPStatus.METHOD_NOT_ALLOWED)
-    yield Call('GET', '/deliberate/observables', HTTPStatus.METHOD_NOT_ALLOWED)
     yield Call('GET', '/observe/observables', HTTPStatus.METHOD_NOT_ALLOWED)
     yield Call('GET', '/refer/observables', HTTPStatus.METHOD_NOT_ALLOWED)
-    yield Call('GET', '/respond/observables', HTTPStatus.METHOD_NOT_ALLOWED)
-    yield Call('GET', '/respond/trigger', HTTPStatus.METHOD_NOT_ALLOWED)
 
 
 @fixture(scope='module',