Remove Environment level user provisioning

tests/domain/test_environment_roles.py

@@ -99,7 +99,6 @@ def test_disable_checks_env_provisioning_status(session):
     assert env_role1.disabled
 
     environment.cloud_id = "cloud-id"
-    environment.root_user_info = {"credentials": "credentials"}
     session.add(environment)
     session.commit()
     session.refresh(environment)
@@ -111,9 +110,8 @@ def test_disable_checks_env_provisioning_status(session):
 
 
 def test_disable_checks_env_role_provisioning_status():
-    environment = EnvironmentFactory.create(
-        cloud_id="cloud-id", root_user_info={"credentials": "credentials"}
-    )
+    environment = EnvironmentFactory.create(cloud_id="cloud-id")
+    environment.application.portfolio.csp_data = {"tenant_id": uuid4().hex}
     env_role1 = EnvironmentRoleFactory.create(environment=environment)
     assert not env_role1.csp_user_id
     env_role1 = EnvironmentRoles.disable(env_role1.id)

tests/domain/test_environments.py

@@ -185,31 +185,3 @@ class TestGetEnvironmentsPendingCreate(EnvQueryTest):
             app_data={"cloud_id": uuid4().hex},
         )
         assert len(Environments.get_environments_pending_creation(self.NOW)) == 0
-
-
-class TestGetEnvironmentsPendingAtatUserCreation(EnvQueryTest):
-    def test_with_provisioned_environment(self):
-        self.create_portfolio_with_clins(
-            [(self.YESTERDAY, self.TOMORROW)],
-            {"cloud_id": uuid4().hex, "root_user_info": {}},
-        )
-        assert (
-            len(Environments.get_environments_pending_atat_user_creation(self.NOW)) == 0
-        )
-
-    def test_with_unprovisioned_environment(self):
-        self.create_portfolio_with_clins(
-            [(self.YESTERDAY, self.TOMORROW)], app_data={"cloud_id": uuid4().hex},
-        )
-        assert (
-            len(Environments.get_environments_pending_atat_user_creation(self.NOW)) == 0
-        )
-
-    def test_with_unprovisioned_expired_clins_environment(self):
-        self.create_portfolio_with_clins(
-            [(self.YESTERDAY, self.YESTERDAY)],
-            {"cloud_id": uuid4().hex, "root_user_info": None},
-        )
-        assert (
-            len(Environments.get_environments_pending_atat_user_creation(self.NOW)) == 0
-        )

tests/models/test_environments.py

@@ -54,18 +54,8 @@ def test_audit_event_for_environment_deletion(session):
 @pytest.mark.parametrize(
     "env_data,expected_status",
     [
-        [
-            {"cloud_id": None, "root_user_info": None},
-            Environment.ProvisioningStatus.PENDING,
-        ],
-        [
-            {"cloud_id": 1, "root_user_info": None},
-            Environment.ProvisioningStatus.PENDING,
-        ],
-        [
-            {"cloud_id": 1, "root_user_info": {}},
-            Environment.ProvisioningStatus.COMPLETED,
-        ],
+        [{"cloud_id": None,}, Environment.ProvisioningStatus.PENDING],
+        [{"cloud_id": 1}, Environment.ProvisioningStatus.COMPLETED],
     ],
 )
 def test_environment_provisioning_status(env_data, expected_status):

tests/test_jobs.py

@@ -12,14 +12,12 @@ from atst.jobs import (
     dispatch_create_environment,
     dispatch_create_application,
     dispatch_create_user,
-    dispatch_create_atat_admin_user,
     dispatch_provision_portfolio,
     create_environment,
     do_create_user,
     do_provision_portfolio,
     do_create_environment,
     do_create_application,
-    do_create_atat_admin_user,
 )
 from tests.factories import (
     EnvironmentFactory,
@@ -153,14 +151,6 @@ def test_create_user_job(session, csp):
     assert app_role.cloud_id
 
 
-def test_create_atat_admin_user(csp, session):
-    environment = EnvironmentFactory.create(cloud_id="something")
-    do_create_atat_admin_user(csp, environment.id)
-    session.refresh(environment)
-
-    assert environment.root_user_info
-
-
 def test_dispatch_create_environment(session, monkeypatch):
     # Given that I have a portfolio with an active CLIN and two environments,
     # one of which is deleted
@@ -231,36 +221,9 @@ def test_dispatch_create_user(monkeypatch):
     mock.delay.assert_called_once_with(application_role_ids=[app_role.id])
 
 
-def test_dispatch_create_atat_admin_user(session, monkeypatch):
-    portfolio = PortfolioFactory.create(
-        applications=[
-            {"environments": [{"cloud_id": uuid4().hex, "root_user_info": None}]}
-        ],
-        task_orders=[
-            {
-                "create_clins": [
-                    {
-                        "start_date": pendulum.now().subtract(days=1),
-                        "end_date": pendulum.now().add(days=1),
-                    }
-                ]
-            }
-        ],
-    )
-    mock = Mock()
-    monkeypatch.setattr("atst.jobs.create_atat_admin_user", mock)
-    environment = portfolio.applications[0].environments[0]
-
-    dispatch_create_atat_admin_user.run()
-
-    mock.delay.assert_called_once_with(environment_id=environment.id)
-
-
 def test_create_environment_no_dupes(session, celery_app, celery_worker):
     portfolio = PortfolioFactory.create(
-        applications=[
-            {"environments": [{"cloud_id": uuid4().hex, "root_user_info": {}}]}
-        ],
+        applications=[{"environments": [{"cloud_id": uuid4().hex}]}],
         task_orders=[
             {
                 "create_clins": [