Merge commit '80a4bc7f846a31549a1a477b3f714846929eefea'

Author: Joe Stubbs

Makefile

@@ -0,0 +1,55 @@
+# Makefile for local development
+
+
+# Retrieves present working directory (./abaco) and sets :dev tag
+export abaco_path = ${PWD}
+export TAG = :dev
+
+# Builds Docker images to run local-dev (abaco/core, abaco/prom, abaco/nginx, etc.)
+build:
+	### Local Dev Images ###
+	@docker pull abaco/core$$TAG
+	@docker pull abaco/nginx$$TAG
+
+	### Database images ###
+	@docker pull rabbitmq:3.5.3-management
+	@docker pull redis
+	@docker pull mongo
+
+	### In-Development Images ###
+	@docker pull abaco/prom$$TAG
+	@docker pull abaco/dashboard
+
+# Starts up local environment (docker containers) in daemon mode
+deploy: build
+	@docker-compose up -d
+
+# Runs test suite against current repository
+test: deploy
+	@./build_and_test.sh
+
+# Builds a few sample Docker images
+samples:
+	@docker build -t abaco_test -f samples/abaco_test/Dockerfile samples/abaco_test
+	@docker build -t docker_ps -f samples/docker_ps/Dockerfile samples/docker_ps
+	@docker build -t word_count -f samples/word_count/Dockerfile samples/word_count
+
+# Creates every Docker image in samples folder
+all-samples:
+	@for file in samples/*; do \
+		if [[ "$$file" != "samples/README.md" ]]; then \
+			docker build -t $$file -f $$file/Dockerfile $$file; \
+		fi \
+	done
+
+# Cleanly remove docker images necessary for local-dev
+clean:
+	@docker-compose down
+
+# Removes/ends all active Docker containers
+force-clean:
+	@docker rm -f `docker ps -aq`
+
+# WARNING: Deletes all non-active Docker images
+prune:
+	@docker system prune -a

abaco.log

@@ -0,0 +1 @@
+

actors/aga.py

@@ -41,7 +41,7 @@ def _token(self, data):
         logger.debug("top of _token")
         auth = requests.auth.HTTPBasicAuth(self.api_key, self.api_secret)
         logger.debug("about to make POST request for token; URL: {}; "
-                     "data: {}; auth: {}".format(self.token_url, data, auth))
+                     "data: {}; auth: {}:{}".format(self.token_url, data, self.api_key, self.api_secret))
         resp = requests.post(self.token_url, data=data, auth=auth,
                              verify=self.verify)
         logger.debug("made request for token; rsp: {}".format(resp))
@@ -178,3 +178,13 @@ def delete(self, clientName):
             return {}
         except Exception as e:
             raise AgaveError('Error creating client: {}'.format(e))
+
+    def list(self):
+        """List all Agave OAuth2 clients."""
+        auth = requests.auth.HTTPBasicAuth(self.parent.username, self.parent.password)
+        try:
+            rsp = requests.get(url='{}/clients/v2'.format(self.parent.api_server), auth=auth)
+            rsp.raise_for_status()
+            return rsp
+        except Exception as e:
+            raise AgaveError('Error listing clients: {}'.format(e))

actors/auth.py

@@ -94,13 +94,23 @@ def check_nonce():
     g.api_server = get_api_server(g.tenant)
     logger.debug("tenant associated with nonce: {}".format(g.tenant))
     # get the actor_id base on the request path
-    actor_id = get_db_id()
-    logger.debug("db_id: {}".format(actor_id))
+    actor_id, actor_identifier = get_db_id()
+    logger.debug("db_id: {}; actor_identifier: {}".format(actor_id, actor_identifier))
     level = required_level(request)
-    Nonce.check_and_redeem_nonce(actor_id, nonce_id, level)
+
+    # if the actor_identifier is an alias, then the nonce must be attached to that, so we must pass that in the
+    # nonce check:
+    if is_hashid(actor_identifier):
+        Nonce.check_and_redeem_nonce(actor_id=actor_id, alias=None, nonce_id=nonce_id, level=level)
+    else:
+        alias_id = Alias.generate_alias_id(tenant=g.tenant, alias=actor_identifier)
+        Nonce.check_and_redeem_nonce(actor_id=None, alias=alias_id, nonce_id=nonce_id, level=level)
     # if we were able to redeem the nonce, update auth context with the actor owner data:
     logger.debug("nonce valid and redeemed.")
-    nonce = Nonce.get_nonce(actor_id, nonce_id)
+    if is_hashid(actor_identifier):
+        nonce = Nonce.get_nonce(actor_id=actor_id, alias=None, nonce_id=nonce_id)
+    else:
+        nonce = Nonce.get_nonce(actor_id=None, alias=alias_id, nonce_id=nonce_id)
     g.user = nonce.owner
     # update roles data with that stored on the nonce:
     g.roles = nonce.roles
@@ -137,7 +147,7 @@ def authorization():
     else:
         # every other route should have an actor identifier
         logger.debug("fetching db_id; rule: {}".format(request.url_rule.rule))
-        db_id = get_db_id()
+        db_id, _ = get_db_id()
     g.db_id = db_id
     logger.debug("db_id: {}".format(db_id))
 
@@ -307,7 +317,7 @@ def check_permissions(user, identifier, level):
 
 
 def get_db_id():
-    """Get the db_id from the request path."""
+    """Get the db_id and actor_identifier from the request path."""
     # logger.debug("top of get_db_id. request.path: {}".format(request.path))
     path_split = request.path.split("/")
     if len(path_split) < 3:
@@ -327,7 +337,7 @@ def get_db_id():
         logger.error(msg)
         raise ResourceError(msg)
     logger.debug("actor_id: {}".format(actor_id))
-    return Actor.get_dbid(g.tenant, actor_id)
+    return Actor.get_dbid(g.tenant, actor_id), actor_identifier
 
 def get_alias_id():
     """Get the alias from the request path."""

actors/channels.py

@@ -85,15 +85,14 @@ def __init__(self, name='default'):
                          connection_type=RabbitConnection,
                          uri=self.uri)
 
-    def put_cmd(self, actor_id, worker_ids, image, tenant, num=None, stop_existing=True):
+    def put_cmd(self, actor_id, worker_id, image, tenant, stop_existing=True):
         """Put a new command on the command channel."""
         msg = {'actor_id': actor_id,
-               'worker_ids': worker_ids,
+               'worker_id': worker_id,
                'image': image,
                'tenant': tenant,
                'stop_existing': stop_existing}
-        if num:
-            msg['num'] = num
+
         self.put(msg)
 
 

actors/codes.py

@@ -3,7 +3,14 @@
 from agaveflask.logs import get_logger
 logger = get_logger(__name__)
 
+SPAWNER_SETUP = 'SPAWNER SETUP'
+PULLING_IMAGE = 'PULLING IMAGE'
+CREATING_CONTAINER = 'CREATING CONTAINER'
+UPDATING_STORE = 'UPDATING STORE'
+#TODO: error include prior state ie ERROR previous STATE
+#TODO: comment about order of states
 REQUESTED = 'REQUESTED'
+PROCESSING = 'PROCESSING'
 COMPLETE = 'COMPLETE'
 SUBMITTED = 'SUBMITTED'
 READY = 'READY'