Update Codes Based on Feedbacks

setup.py

@@ -26,6 +26,8 @@ setup(name='shipyard_airflow',
       install_requires=[
         'falcon',
         'requests',
+        'configparser',
         'uwsgi>1.4'
       ]
      )
+

shipyard_airflow/control/api.py

@@ -18,10 +18,10 @@ from .regions import RegionsResource, RegionResource
 from .base import ShipyardRequest, BaseResource
 from .tasks import TaskResource
 from .dag_runs import DagRunResource
-
 from .middleware import AuthMiddleware, ContextMiddleware, LoggingMiddleware
 
 def start_api():
+
     control_api = falcon.API(request_type=ShipyardRequest,
                              middleware=[AuthMiddleware(), ContextMiddleware(), LoggingMiddleware()])
 
@@ -51,3 +51,4 @@ class VersionsResource(BaseResource):
                                     'status': 'stable'
                                 }})
         resp.status = falcon.HTTP_200
+

shipyard_airflow/control/base.py

@@ -13,6 +13,8 @@
 # limitations under the License.
 import falcon.request as request
 import uuid
+import json
+import ConfigParser
 
 class BaseResource(object):
 
@@ -40,6 +42,33 @@ class BaseResource(object):
         else:
             return True
 
+    # Error Handling
+    def return_error(self, resp, status_code, message="", retry=False):
+        """
+        Write a error message body and throw a Falcon exception to trigger an HTTP status
+
+        :param resp: Falcon response object to update
+        :param status_code: Falcon status_code constant
+        :param message: Optional error message to include in the body
+        :param retry: Optional flag whether client should retry the operation. Can ignore if we rely solely on 4XX vs 5xx status codes
+        """
+        resp.body = json.dumps({'type': 'error', 'message': message, 'retry': retry})
+        resp.content_type = 'application/json'
+        resp.status = status_code
+
+    # Get Config Data
+    def retrieve_config(self, resp, section="", variable=""):
+        config = ConfigParser.ConfigParser()
+
+        # The current assumption is that shipyard.conf will be placed in a fixed path
+        # within the shipyard container - Path TBD
+        config.read('/home/ubuntu/att-comdev/shipyard/shipyard_airflow/control/shipyard.conf')
+
+        # Retrieve data from shipyard.conf
+        query_data = config.get(section, variable)
+
+        return query_data
+
 
 class ShipyardRequestContext(object):
 
@@ -72,3 +101,4 @@ class ShipyardRequestContext(object):
 
 class ShipyardRequest(request.Request):
     context_type = ShipyardRequestContext
+

shipyard_airflow/control/dag_runs.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 import falcon
 import requests
+import json
 
 from .base import BaseResource
 
@@ -21,7 +22,10 @@ class DagRunResource(BaseResource):
     authorized_roles = ['user']
 
     def on_post(self, req, resp, dag_id, run_id=None, conf=None, execution_date=None):
-        req_url = 'http://localhost:32080/api/experimental/dags/{}/dag_runs'.format(dag_id)
+        # Retrieve URL
+        web_server_url = self.retrieve_config(resp, 'BASE', 'WEB_SERVER')
+
+        req_url = '{}/api/experimental/dags/{}/dag_runs'.format(web_server_url, dag_id)
  
         response = requests.post(req_url,
                                  json={
@@ -29,11 +33,10 @@ class DagRunResource(BaseResource):
                                  "conf": conf,
                                  "execution_date": execution_date,
                              })
-        if not response.ok:
-            raise IOError()
-        else:
+
+        if response.ok:
             resp.status = falcon.HTTP_200
+        else:
+            self.return_error(resp, falcon.HTTP_400, 'Fail to Execute Dag')
+            return
 
-        data = response.json()
-
-        return data['message']

shipyard_airflow/control/middleware.py

@@ -86,3 +86,4 @@ class LoggingMiddleware(object):
 
         resp.append_header('X-Shipyard-Req', ctx.request_id)
         self.logger.info("%s - %s" % (req.uri, resp.status), extra=extra)
+

shipyard_airflow/control/regions.py

@@ -28,3 +28,4 @@ class RegionResource(BaseResource):
 
     def on_get(self, req, resp, region_id):
         resp.status = falcon.HTTP_200
+

shipyard_airflow/control/shipyard.conf

@@ -0,0 +1,3 @@
+[BASE]
+WEB_SERVER=http://localhost:32080
+

shipyard_airflow/control/tasks.py

@@ -22,7 +22,17 @@ class TaskResource(BaseResource):
     authorized_roles = ['user']
 
     def on_get(self, req, resp, dag_id, task_id):
-        resp.status = falcon.HTTP_200
-        req_url = 'http://localhost:32080/api/experimental/dags/{}/tasks/{}'.format(dag_id, task_id)
+        # Retrieve URL
+        web_server_url = self.retrieve_config(resp, 'BASE', 'WEB_SERVER')
+
+        req_url = '{}/api/experimental/dags/{}/tasks/{}'.format(web_server_url, dag_id, task_id)
         task_details = requests.get(req_url).json()
-        resp.body = json.dumps(task_details)
+
+        if 'error' in task_details:
+            resp.status = falcon.HTTP_400
+            resp.body = json.dumps(task_details)
+            return
+        else:
+            resp.status = falcon.HTTP_200
+            resp.body = json.dumps(task_details)
+

shipyard_airflow/setup.py

@@ -26,6 +26,8 @@ setup(name='shipyard_airflow',
       install_requires=[
         'falcon',
         'requests',
+        'configparser',
         'uwsgi>1.4'
       ]
      )
+

shipyard_airflow/shipyard.py

@@ -37,3 +37,4 @@ def start_shipyard():
     return api.start_api()
 
 shipyard = start_shipyard()
+