Merge pull request #1783 from atlassian/apps-count-bitbucket

added bitbucket apps count

Author: SergeyMoroz0703

app/util/analytics/analytics_utils.py

@@ -107,7 +107,7 @@ 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]:
+    if collector.app_type in [JIRA, JSM, CONFLUENCE, BITBUCKET]:
         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}')

app/util/analytics/application_info.py

@@ -206,6 +206,37 @@ def nodes_count(self):
     def dataset_information(self):
         return f'{self.client.get_bitbucket_repo_count()} repositories'
 
+    @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 Jsm(BaseApplication):
     type = JSM
@@ -228,6 +259,37 @@ def __issues_count(self):
     def dataset_information(self):
         return f"{self.__issues_count()} issues"
 
+    @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 Crowd(BaseApplication):
     type = CROWD

app/util/api/bitbucket_clients.py

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

app/util/api/jira_clients.py

@@ -302,19 +302,7 @@ def get_license_details(self):
         return r.json()
 
     def get_installed_apps(self):
-        login_url = f'{self.host}/login.jsp'
-        auth_url = f'{self.host}/secure/admin/WebSudoAuthenticate.jspa'
-        auth_body = {
-            'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa',
-            'webSudoIsPost': False,
-            'webSudoPassword': self.password
-        }
-        self.post(login_url, error_msg='Could not login in')
-        auth_body['atl_token'] = self.session.cookies.get_dict()['atlassian.xsrf.token']
-        self._session.post(auth_url, data=auth_body)
-        self.headers['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,' \
-                                 'image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7'
-
         api_url = f'{self.host}/rest/plugins/1.0/'
-        r = self.get(api_url, error_msg="ERROR: Could not get the installed apps.")
+        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/bitbucket_prepare_data.py

@@ -134,6 +134,21 @@ def __check_for_admin_permissions(bitbucket_api):
     bitbucket_api.get_user_global_permissions()
 
 
+def __check_number_of_custom_app(bitbucket_api):
+    try:
+        all_apps = bitbucket_api.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")
 
@@ -142,7 +157,7 @@ def main():
 
     client = BitbucketRestClient(url, BITBUCKET_SETTINGS.admin_login, BITBUCKET_SETTINGS.admin_password,
                                  verify=BITBUCKET_SETTINGS.secure)
-
+    __check_number_of_custom_app(client)
     __check_current_language(client)
     __check_for_admin_permissions(client)