Add create_user task
This commit is contained in:
@@ -194,7 +194,7 @@ class MockCloudProvider(CloudProviderInterface):
|
||||
GeneralCSPException("Could not create user."),
|
||||
)
|
||||
|
||||
return {"id": self._id()}
|
||||
return self._id()
|
||||
|
||||
def suspend_user(self, auth_credentials, csp_user_id):
|
||||
self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION)
|
||||
|
@@ -1,5 +1,10 @@
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
from atst.database import db
|
||||
from atst.models import EnvironmentRole, ApplicationRole
|
||||
from atst.domain.exceptions import NotFoundError
|
||||
from uuid import UUID
|
||||
from typing import List
|
||||
|
||||
|
||||
class EnvironmentRoles(object):
|
||||
@@ -22,6 +27,15 @@ class EnvironmentRoles(object):
|
||||
)
|
||||
return existing_env_role
|
||||
|
||||
@classmethod
|
||||
def get_by_id(cls, id_) -> EnvironmentRole:
|
||||
try:
|
||||
return (
|
||||
db.session.query(EnvironmentRole).filter(EnvironmentRole.id == id_)
|
||||
).one()
|
||||
except NoResultFound:
|
||||
raise NotFoundError(cls.resource_name)
|
||||
|
||||
@classmethod
|
||||
def get_by_user_and_environment(cls, user_id, environment_id):
|
||||
existing_env_role = (
|
||||
@@ -54,3 +68,12 @@ class EnvironmentRoles(object):
|
||||
.filter(EnvironmentRole.deleted != True)
|
||||
.all()
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def get_environment_roles_pending_creation(cls) -> List[UUID]:
|
||||
results = (
|
||||
db.session.query(EnvironmentRole.id)
|
||||
# TODO
|
||||
.filter(EnvironmentRole.status == "PENDING").all()
|
||||
)
|
||||
return [id_ for id_, in results]
|
||||
|
30
atst/jobs.py
30
atst/jobs.py
@@ -6,6 +6,7 @@ from atst.queue import celery
|
||||
from atst.models import EnvironmentJobFailure, EnvironmentRoleJobFailure
|
||||
from atst.domain.csp.cloud import CloudProviderInterface, GeneralCSPException
|
||||
from atst.domain.environments import Environments
|
||||
from atst.domain.environment_roles import EnvironmentRoles
|
||||
from atst.models.utils import claim_for_update
|
||||
|
||||
|
||||
@@ -101,6 +102,20 @@ def do_create_environment_baseline(csp: CloudProviderInterface, environment_id=N
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def do_create_user(csp: CloudProviderInterface, environment_role_id=None):
|
||||
environment_role = EnvironmentRoles.get_by_id(environment_role_id)
|
||||
|
||||
with claim_for_update(environment_role) as environment_role:
|
||||
credentials = environment_role.environment.root_user_info["credentials"]
|
||||
|
||||
csp_user_id = csp.create_or_update_user(
|
||||
credentials, environment_role, "role_id"
|
||||
)
|
||||
environment_role.csp_user_id = csp_user_id
|
||||
db.session.add(environment_role)
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def do_work(fn, task, csp, **kwargs):
|
||||
try:
|
||||
fn(csp, **kwargs)
|
||||
@@ -130,6 +145,13 @@ def create_environment_baseline(self, environment_id=None):
|
||||
)
|
||||
|
||||
|
||||
@celery.task(bind=True)
|
||||
def create_user(self, environment_role_id=None):
|
||||
do_work(
|
||||
do_create_user, self, app.csp.cloud, environment_role_id=environment_role_id
|
||||
)
|
||||
|
||||
|
||||
@celery.task(bind=True)
|
||||
def dispatch_create_environment(self):
|
||||
for environment_id in Environments.get_environments_pending_creation(
|
||||
@@ -152,3 +174,11 @@ def dispatch_create_environment_baseline(self):
|
||||
pendulum.now()
|
||||
):
|
||||
create_environment_baseline.delay(environment_id=environment_id)
|
||||
|
||||
|
||||
@celery.task(bind=True)
|
||||
def dispatch_provision_user(self):
|
||||
for (
|
||||
environment_role_id
|
||||
) in EnvironmentRoles.get_environment_roles_pending_creation():
|
||||
create_user.delay(environment_role_id=environment_role_id)
|
||||
|
@@ -1,5 +1,5 @@
|
||||
from enum import Enum
|
||||
from sqlalchemy import Index, ForeignKey, Column, String
|
||||
from sqlalchemy import Index, ForeignKey, Column, String, TIMESTAMP
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
@@ -33,6 +33,9 @@ class EnvironmentRole(
|
||||
|
||||
job_failures = relationship("EnvironmentRoleJobFailure")
|
||||
|
||||
csp_user_id = Column(String())
|
||||
claimed_until = Column(TIMESTAMP(timezone=True))
|
||||
|
||||
def __repr__(self):
|
||||
return "<EnvironmentRole(role='{}', user='{}', environment='{}', id='{}')>".format(
|
||||
self.role, self.application_role.user_name, self.environment.name, self.id
|
||||
|
Reference in New Issue
Block a user