Merge branch 'staging' into app-env-provisioning

atst/models/portfolio_state_machine.py

@@ -1,3 +1,5 @@
+import importlib
+
 from sqlalchemy import Column, ForeignKey, Enum as SQLAEnum
 from sqlalchemy.orm import relationship, reconstructor
 from sqlalchemy.dialects.postgresql import UUID
@@ -9,7 +11,6 @@ from transitions.extensions.states import add_state_features, Tags
 from flask import current_app as app
 
 from atst.domain.csp.cloud.exceptions import ConnectionException, UnknownServerException
-from atst.domain.csp import MockCSP, AzureCSP, get_stage_csp_class
 from atst.database import db
 from atst.models.types import Id
 from atst.models.base import Base
@@ -17,6 +18,25 @@ import atst.models.mixins as mixins
 from atst.models.mixins.state_machines import FSMStates, AzureStages, _build_transitions
 
 
+def _stage_to_classname(stage):
+    return "".join(map(lambda word: word.capitalize(), stage.split("_")))
+
+
+def get_stage_csp_class(stage, class_type):
+    """
+    given a stage name and class_type return the class
+    class_type is either 'payload' or 'result'
+
+    """
+    cls_name = f"{_stage_to_classname(stage)}CSP{class_type.capitalize()}"
+    try:
+        return getattr(
+            importlib.import_module("atst.domain.csp.cloud.models"), cls_name
+        )
+    except AttributeError:
+        print("could not import CSP Result class <%s>" % cls_name)
+
+
 @add_state_features(Tags)
 class StateMachineWithTags(Machine):
     pass
@@ -138,76 +158,53 @@ class PortfolioStateMachine(
             self.fail_stage(stage)
 
         # TODO: Determine best place to do this, maybe @reconstructor
-        csp = event.kwargs.get("csp")
-        if csp is not None:
-            self.csp = AzureCSP(app).cloud
-        else:
-            self.csp = MockCSP(app).cloud
+        self.csp = app.csp.cloud
 
-        attempts_count = 5
-        for attempt in range(attempts_count):
-            try:
-                func_name = f"create_{stage}"
-                response = getattr(self.csp, func_name)(payload_data)
-            except (ConnectionException, UnknownServerException) as exc:
-                app.logger.error(
-                    f"CSP api call. Caught exception for {self.__repr__()}. Retry attempt {attempt}",
-                    exc_info=1,
-                )
-                continue
-            else:
-                break
-        else:
-            # failed all attempts
-            logger.info(f"CSP api call failed after {attempts_count} attempts.")
+        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()
+
+            if getattr(response, "get_creds", None) is not None:
+                new_creds = response.get_creds()
+                # TODO: one way salted hash of tenant_id to use as kv key name?
+                tenant_id = new_creds.get("tenant_id")
+                secret = self.csp.get_secret(tenant_id, new_creds)
+                secret.update(new_creds)
+                self.csp.set_secret(tenant_id, secret)
+        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)
+        except (ConnectionException, UnknownServerException) as exc:
+            app.logger.error(
+                f"CSP api call. Caught exception for {self.__repr__()}.", exc_info=1,
+            )
             self.fail_stage(stage)
-
-        if self.portfolio.csp_data is None:
-            self.portfolio.csp_data = {}
-        self.portfolio.csp_data.update(response)
-        db.session.add(self.portfolio)
-        db.session.commit()
-
-        # store any updated creds, if necessary
 
         self.finish_stage(stage)
 
     def is_csp_data_valid(self, event):
-        # check portfolio csp details json field for fields
+        """
+        This function guards advancing states from *_IN_PROGRESS to *_COMPLETED.
+        """
         if self.portfolio.csp_data is None or not isinstance(
             self.portfolio.csp_data, dict
         ):
             print("no csp data")
             return False
 
-        stage = self.current_state.name.split("_IN_PROGRESS")[0].lower()
-        stage_data = self.portfolio.csp_data
-        cls = get_stage_csp_class(stage, "result")
-        if not cls:
-            return False
-
-        try:
-            dc = cls(**stage_data)
-            if getattr(dc, "get_creds", None) is not None:
-                new_creds = dc.get_creds()
-                tenant_id = new_creds.get("tenant_id")
-                secret = self.csp.get_secret(tenant_id)
-                secret.update(new_creds)
-                self.csp.set_secret(tenant_id, secret)
-
-        except PydanticValidationError as exc:
-            app.logger.error(
-                f"Payload Validation Error in {self.__repr__()}:", exc_info=1
-            )
-            app.logger.info(exc.json())
-            app.logger.info(payload)
-
-            return False
-
         return True
 
-        # print('failed condition', self.portfolio.csp_data)
-
     @property
     def application_id(self):
         return None