merge staging

atst/models/environment.py

@@ -1,11 +1,9 @@
 from sqlalchemy import Column, ForeignKey, String, UniqueConstraint
 from sqlalchemy.orm import relationship
-from sqlalchemy.dialects.postgresql import JSONB
-from enum import Enum
 
-from atst.models.base import Base
 import atst.models.mixins as mixins
 import atst.models.types as types
+from atst.models.base import Base
 
 
 class Environment(
@@ -30,7 +28,6 @@ class Environment(
     creator = relationship("User")
 
     cloud_id = Column(String)
-    root_user_info = Column(JSONB(none_as_null=True))
 
     roles = relationship(
         "EnvironmentRole",
@@ -44,10 +41,6 @@ class Environment(
         ),
     )
 
-    class ProvisioningStatus(Enum):
-        PENDING = "pending"
-        COMPLETED = "completed"
-
     @property
     def users(self):
         return {r.application_role.user for r in self.roles}
@@ -68,17 +61,6 @@ class Environment(
     def portfolio_id(self):
         return self.application.portfolio_id
 
-    @property
-    def provisioning_status(self) -> ProvisioningStatus:
-        if self.cloud_id is None or self.root_user_info is None:
-            return self.ProvisioningStatus.PENDING
-        else:
-            return self.ProvisioningStatus.COMPLETED
-
-    @property
-    def is_pending(self):
-        return self.provisioning_status == self.ProvisioningStatus.PENDING
-
     def __repr__(self):
         return "<Environment(name='{}', num_users='{}', application='{}', portfolio='{}', id='{}')>".format(
             self.name,
@@ -91,11 +73,3 @@ class Environment(
     @property
     def history(self):
         return self.get_changes()
-
-    @property
-    def csp_credentials(self):
-        return (
-            self.root_user_info.get("credentials")
-            if self.root_user_info is not None
-            else None
-        )

atst/models/portfolio_state_machine.py

@@ -179,34 +179,30 @@ class PortfolioStateMachine(
         try:
             func_name = f"create_{stage}"
             response = getattr(self.csp, func_name)(payload_data)
+            if self.portfolio.csp_data is None:
+                self.portfolio.csp_data = {}
+            self.portfolio.csp_data.update(response.dict())
+            db.session.add(self.portfolio)
+            db.session.commit()
+        except PydanticValidationError as exc:
+            app.logger.error(
+                f"Failed to cast response to valid result class {self.__repr__()}:",
+                exc_info=1,
+            )
+            app.logger.info(exc.json())
+            print(exc.json())
+            app.logger.info(payload_data)
+            # TODO: Ensure that failing the stage does not preclude a Celery retry
+            self.fail_stage(stage)
+        # TODO: catch and handle general CSP exception here
         except (ConnectionException, UnknownServerException) as exc:
             app.logger.error(
                 f"CSP api call. Caught exception for {self.__repr__()}.", exc_info=1,
             )
+            # TODO: Ensure that failing the stage does not preclude a Celery retry
             self.fail_stage(stage)
 
-        if response.get("status") == "error":
-            self.fail_stage(stage)
-
-        elif response.get("status") == "ok":
-            try:
-
-                if self.portfolio.csp_data is None:
-                    self.portfolio.csp_data = {}
-                self.portfolio.csp_data.update(response.dict())
-                db.session.add(self.portfolio)
-                db.session.commit()
-            except PydanticValidationError as exc:
-                app.logger.error(
-                    f"Failed to cast response to valid result class {self.__repr__()}:",
-                    exc_info=1,
-                )
-                app.logger.info(exc.json())
-                print(exc.json())
-                app.logger.info(payload_data)
-                self.fail_stage(stage)
-
-            self.finish_stage(stage)
+        self.finish_stage(stage)
 
     def is_csp_data_valid(self, event):
         """