remove asset descriptors

Author: dhruv-droid-r2

executor/source_managers/argocd_source_manager.py

@@ -35,7 +35,6 @@ def __init__(self):
         self.task_type_callable_map = {
             ArgoCD.TaskType.FETCH_DEPLOYMENT_INFO: {
                 'executor': self.fetch_deployment_info,
-                'asset_descriptor': self.argocd_application_asset_descriptor,
                 'model_types': [SourceModelType.ARGOCD_APPS],
                 'result_type': PlaybookTaskResultType.TABLE,
                 'display_name': 'Fetch Latest Deployment Info',
@@ -222,36 +221,6 @@ def rollback_application(self, time_range: TimeRange, argocd_task: ArgoCD,
     def validate_command(argocd_task: ArgoCD):
         return "REQUIRES_APPROVAL"
 
-    @staticmethod
-    def argocd_application_asset_descriptor(argocd_connector: ConnectorProto, filters: dict = None) -> str:
-        try:
-            assets: AccountConnectorAssets = asset_manager_facade.get_asset_model_values(argocd_connector,
-                                                                                         SourceModelType.ARGOCD_APPS,
-                                                                                         AccountConnectorAssetsModelFilters())
-            if not assets:
-                logger.warning(
-                    f"ArgoCDSourcesManager.argocd_application_asset_descriptor:: No assets found for connector"
-                    f" app : {argocd_connector.account_id.value}, and Connector: {argocd_connector.id.value}")
-                return None
-
-            assets = assets[0]
-            argocd_assets: [ArgoCDAppsAssetModel] = assets.argocd.assets
-            all_app_asset: [ArgoCDAppsAssetModel] = [argocd_asset.argocd_apps for argocd_asset in argocd_assets if
-                                                     argocd_asset.type == SourceModelType.ARGOCD_APPS]
-            asset_list_string = ""
-            # TODO(VG: clean this up later)
-            asset_list_string += "These are all the application deployments in ArgoCD. If a user-asked application contains more application within itself, then don't fetch information for these contained applications.: \n\n"
-            for app_asset in all_app_asset:
-                asset_list_string += f"{app_asset.name.value} has path {app_asset.path.value},\n"
-                asset_list_string += "\n\n"
-            return asset_list_string
-
-        except Exception as e:
-            logger.error(f"ArgoCDSourcesManager.argocd_application_asset_descriptor:: Error while generating "
-                         f"asset descriptor for account: {argocd_connector.account_id.value} and connector: "
-                         f"{argocd_connector.id.value} with error: {e}")
-        return None
-
     def get_application_health(self, time_range: TimeRange, argocd_task: ArgoCD,
                               argocd_connector: ConnectorProto) -> PlaybookTaskResult:
         try:

executor/source_managers/jira_source_manager.py

@@ -28,7 +28,6 @@ def __init__(self):
         self.task_type_callable_map = {
             Jira.TaskType.CREATE_TICKET: {
                 'executor': self.create_ticket,
-                'asset_descriptor': self.jira_project_asset_descriptor,
                 'model_types': [SourceModelType.JIRA_PROJECT],
                 'result_type': PlaybookTaskResultType.API_RESPONSE,
                 'display_name': 'Create JIRA Ticket',
@@ -91,7 +90,6 @@ def __init__(self):
             },
             Jira.TaskType.ASSIGN_TICKET: {
                 'executor': self.assign_ticket,
-                'asset_descriptor': self.jira_user_asset_descriptor,
                 'model_types': [SourceModelType.JIRA_USER],
                 'result_type': PlaybookTaskResultType.API_RESPONSE,
                 'display_name': 'Assign JIRA Ticket',
@@ -147,7 +145,6 @@ def __init__(self):
             },
             Jira.TaskType.SEARCH_TICKETS: {
                 'executor': self.search_tickets,
-                'asset_descriptor': self.jira_project_asset_descriptor,
                 'model_types': [SourceModelType.JIRA_PROJECT],
                 'result_type': PlaybookTaskResultType.API_RESPONSE,
                 'display_name': 'Search JIRA Tickets',
@@ -540,64 +537,6 @@ def search_tickets(self, time_range: TimeRange, jira_task: Jira,
                 source=self.source
             )
 
-    @staticmethod
-    def jira_project_asset_descriptor(jira_connector: ConnectorProto, filters: dict = None):
-        try:
-            assets: AccountConnectorAssets = asset_manager_facade.get_asset_model_values(jira_connector,
-                                                                                         SourceModelType.JIRA_PROJECT,
-                                                                                         AccountConnectorAssetsModelFilters())
-            if not assets:
-                logger.warning(f"JiraSourceManager.jira_project_asset_descriptor:: No assets found for "
-                               f"project: {jira_connector.account_id.value}, and Connector: {jira_connector.id.value}")
-            assets = assets[0]
-            jira_assets: [JiraProjectAssetModel] = assets.jira_cloud.assets
-            all_project_asset: [JiraProjectAssetModel] = [jira_asset.jira_project for jira_asset in jira_assets if
-                                                   jira_asset.type == SourceModelType.JIRA_PROJECT]
-            asset_list_string = ''
-            for asset in all_project_asset:
-                asset_list_string += f"project_name: `{asset.name.value}`, project_key: `{asset.key.value}`"
-                asset_list_string += "\n\n"
-            return asset_list_string
-        except Exception as e:
-            logger.error(f"JiraSourceManager.jira_project_asset_descriptor:: Error while generating "
-                         f"asset descriptor for account: {jira_connector.account_id.value} and connector: "
-                         f"{jira_connector.id.value} with error: {e}")
-        return None
-
-
-    @staticmethod
-    def jira_user_asset_descriptor(jira_connector: ConnectorProto, filters: dict = None):
-        try:
-            assets: AccountConnectorAssets = asset_manager_facade.get_asset_model_values(
-                jira_connector,
-                SourceModelType.JIRA_USER,
-                AccountConnectorAssetsModelFilters()
-            )
-
-            if not assets:
-                logger.warning(f"JiraSourceManager.jira_user_asset_descriptor:: No user assets found for "
-                               f"account: {jira_connector.account_id.value}, and Connector: {jira_connector.id.value}")
-                return None
-
-            assets = assets[0]
-            jira_users: [JiraUserAssetModel] = assets.jira_cloud.assets
-            all_user_assets: [JiraUserAssetModel] = [jira_user for jira_user in jira_users if
-                                                     jira_user.type == SourceModelType.JIRA_USER]
-            
-            asset_list_string = ''
-            for asset in all_user_assets:
-                asset_list_string += f"User name: `{asset.jira_user.display_name.value}` and Account ID: {asset.jira_user.account_id.value}"
-                asset_list_string += "\n\n"
-
-            return asset_list_string
-
-        except Exception as e:
-            logger.error(f"JiraSourceManager.jira_user_asset_descriptor:: Error while generating "
-                         f"user asset descriptor for account: {jira_connector.account_id.value} and connector: "
-                         f"{jira_connector.id.value} with error: {e}")
-
-        return None
-
     @staticmethod
     def jira_project_user_summary(jira_connector: ConnectorProto, filters: dict = None):
         try: