Merge pull request #1786 from atlassian/bamboo-apps-count

added apps count for bamboo calculation

Author: SergeyMoroz0703

app/util/analytics/analytics_utils.py

@@ -107,10 +107,10 @@ def generate_report_summary(collector):
     summary_report.append(f'Success|{success}')
     summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}')
 
-    if collector.app_type in [JIRA, JSM, CONFLUENCE, BITBUCKET, CROWD]:
-        summary_report.append(f'Applications count|{collector.apps_count}')
-        summary_report.append(f'Custom applications count|{collector.custom_apps_count}')
-        summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}')
+
+    summary_report.append(f'Applications count|{collector.apps_count}')
+    summary_report.append(f'Custom applications count|{collector.custom_apps_count}')
+    summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}')
 
     if collector.app_type == JSM:
         insight = collector.insight

app/util/analytics/application_info.py

@@ -366,6 +366,36 @@ def __build_plans_count(self):
     def dataset_information(self):
         return f"{self.__build_plans_count()} build plans"
 
+    @property
+    def apps_count(self):
+        return len(self.__get_apps)
+
+    @cached_property
+    def __get_apps(self):
+        try:
+            return self.client.get_installed_apps()
+        except Exception as e:
+            print(f'ERROR: Could not get the installed applications. Error: {e}')
+            return []
+
+    @cached_property
+    def __get_custom_apps(self):
+        all_apps = self.__get_apps
+        apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app]
+        non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in
+                              app['vendor']['name'] and app['userInstalled'] == True]
+        return non_atlassian_apps
+
+    @property
+    def custom_app_count(self):
+        return len(self.__get_custom_apps)
+
+    @property
+    def custom_app_count_enabled(self):
+        non_atlassian_apps = self.__get_custom_apps
+        non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True]
+        return len(non_atlassian_apps_enabled)
+
 
 class Insight(Jsm):
     type = INSIGHT

app/util/api/bamboo_clients.py

@@ -246,3 +246,9 @@ def get_status(self):
         else:
             print(f"Warning: failed to get {api_url}: Error: {e}")
             return False
+
+    def get_installed_apps(self):
+        api_url = f'{self.host}/rest/plugins/1.0/'
+        r = self.get(api_url, error_msg="ERROR: Could not get installed plugins.",
+                     headers={'X-Atlassian-Token': 'no-check'})
+        return r.json()['plugins']

app/util/data_preparation/bamboo_prepare_data.py

@@ -75,6 +75,21 @@ def write_test_data_to_files(dataset):
     __write_to_file(BAMBOO_USERS, users)
 
 
+def __check_number_of_custom_app(client):
+    try:
+        all_apps = client.get_installed_apps()
+        apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app]
+        non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in
+                              app['vendor']['name'] and app['userInstalled'] == True]
+        non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps]
+        print(f"Custom application count: {len(non_atlassian_apps)}")
+        if non_atlassian_apps:
+            print(f'Custom app names:')
+            print(*non_atlassian_apps_names, sep='\n')
+    except Exception as e:
+        print(f'ERROR: Could not get the installed applications. Error: {e}')
+
+
 def main():
     print("Started preparing data")
     verify_agents_plans_setup()
@@ -84,7 +99,7 @@ def main():
 
     client = BambooClient(url, BAMBOO_SETTINGS.admin_login, BAMBOO_SETTINGS.admin_password,
                           verify=BAMBOO_SETTINGS.secure)
-
+    __check_number_of_custom_app(client)
     dataset = __create_dataset(client)
     write_test_data_to_files(dataset)
     assert_number_of_agents(client)