Merge pull request #744 from zhxu73/argo_deploy

Using Argo Workflow to Deploy Instance

CHANGELOG.md

@@ -25,6 +25,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 -->
 
 ## [Unreleased](https://github.com/cyverse/atmosphere/compare/v36-9...HEAD) - YYYY-MM-DD
+### Added
+  - script to create access token for users
+
+### Changed
+  - Using argo workflow to run ansible playbooks to deploy instance
+
 
 ## [v36-9](https://github.com/cyverse/atmosphere/compare/v36-8...v36-9) - 2020-06-16
 ### Fixed

Dockerfile

@@ -19,6 +19,7 @@ RUN apt-get update && \
       libssl-dev \
       libxml2-dev \
       libxslt1-dev \
+      locales \
       make \
       netcat \
       openssl \
@@ -39,7 +40,12 @@ RUN apt-get update && \
       uwsgi \
       uwsgi-plugin-python \
       zlib1g-dev && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    locale-gen en_US.UTF-8
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 
 # Create PID and log directories for uWSGI
 RUN mkdir -p /run/uwsgi/app/atmosphere /var/log/uwsgi && \

atmosphere/settings/local.py.j2

@@ -598,3 +598,6 @@ CACHES = {
         'LOCATION': '/var/tmp/django_cache',
     }
 }
+
+# Argo workflow
+ARGO_CONFIG_FILE_PATH = "{{ ARGO_CONFIG_FILE_PATH }}"

docker/argo_config.schema

@@ -0,0 +1,34 @@
+{
+    "type": "object",
+    "properties": {
+        "default": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
+        }
+    },
+    "patternProperties": {
+        "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$": {
+            "$ref": "#/definitions/provider"
+        }
+    },
+    "definitions" : {
+        "provider": {
+            "properties": {
+                "api_host": {"type": "string"},
+                "api_port": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 65535
+                },
+                "token": {"type": "string"},
+                "namespace": {"type": "string"},
+                "workflow_base_dir": {"type": "string"},
+                "zoneinfo": {"type": "string"},
+                "ssl_verify": {"type": "boolean"}
+            },
+            "required": ["api_host", "api_port", "token", "namespace", "workflow_base_dir", "zoneinfo", "ssl_verify"]
+        }
+    },
+    "required": ["default"],
+    "additionalProperties": false
+}

docker/entrypoint.sh

@@ -64,6 +64,11 @@ else
   chown -R www-data:www-data /opt/dev/atmosphere
 fi
 
+# Validate argo config
+cat $SECRETS_DIR/argo.config.yml | python -c "import yaml, json, sys; print(json.dumps(yaml.safe_load(sys.stdin.read())));" | tee /tmp/argo_config.json
+jsonschema -i /tmp/argo_config.json argo_config.schema
+rm /tmp/argo_config.json
+
 # Start services
 sed -i "s/^bind 127.0.0.1 ::1$/bind 127.0.0.1/" /etc/redis/redis.conf
 service redis-server start

scripts/batch_create_access_token.py

@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+"""
+Create access token for users
+
+Usage:
+    python scripts/batch_create_access_token.py --token-name workshop_token --users name1,name2,name3
+"""
+import django
+
+django.setup()
+
+import argparse
+from core.models import AccessToken
+from core.models.user import AtmosphereUser
+from core.models.access_token import create_access_token
+
+
+def parse_arg():
+    """
+    Parse command line arguments.
+
+    Returns:
+        argparse.Namespace: result
+    """
+    parser = argparse.ArgumentParser(
+        description="create or fetch tokens for users"
+    )
+    parser.add_argument(
+        "--users",
+        dest="users",
+        type=str,
+        required=True,
+        help="usernames, comma separated if more than 1(no space)"
+    )
+    parser.add_argument(
+        "--token-name",
+        dest="token_name",
+        type=str,
+        required=True,
+        help="name of the token"
+    )
+
+    args = parser.parse_args()
+    args.users = args.users.split(',')
+    return args
+
+
+def fetch_user_by_username(username):
+    """
+    Fetch user by username
+
+    Args:
+        username (str): username of the user
+
+    Returns:
+        Optional[AtmosphereUser]: user
+    """
+    try:
+        return AtmosphereUser.objects.get(username=username)
+    except Exception as exc:
+        print("unable to fetch user {}".format(username))
+        print(exc)
+        return None
+
+
+def create_or_fetch_token_for_user(user, token_name):
+    """
+    Fetch token with given name for user, create a token if none exists with the same name
+
+    Args:
+        user (AtmosphereUser): user
+        token_name (str): name of the token
+
+    Returns:
+        str: token
+    """
+    # check if there is any existing token by the same name
+    existing_tokens = AccessToken.objects.filter(token__user=user)
+    for token in existing_tokens:
+        if token.name == token_name:
+            # return token if same name
+            return token.token_id
+    # create new token if none with the same name exists
+    new_token = create_access_token(
+        user, token_name, issuer="Personal-Access-Token"
+    )
+    print("new token created for user {}".format(user.username))
+    return new_token.token_id
+
+
+def main():
+    """
+    Entrypoint
+    """
+    args = parse_arg()
+    for username in args.users:
+        user = fetch_user_by_username(username)
+        token = create_or_fetch_token_for_user(user, args.token_name)
+        print("{}, {}".format(username, token))
+
+
+if __name__ == '__main__':
+    main()