Merge branch 'dev' into bamboo-apps-count

# Conflicts:
#	app/util/analytics/analytics_utils.py

Author: admin

app/bamboo.yml

@@ -121,7 +121,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/bitbucket.yml

@@ -87,7 +87,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/confluence.yml

@@ -114,7 +114,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jira.yml

@@ -115,7 +115,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jsm.yml

@@ -167,7 +167,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
   - data-source: sample-labels
     module: junit-xml

app/util/analytics/application_info.py

@@ -315,6 +315,36 @@ def __users_count(self):
     def dataset_information(self):
         return f"{self.__users_count()} users"
 
+    @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 Bamboo(BaseApplication):
     type = BAMBOO

app/util/api/crowd_clients.py

@@ -108,3 +108,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/crowd_prepare_data.py

@@ -40,6 +40,21 @@ def write_test_data_to_files(dataset):
     __write_to_file(CROWD_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")
 
@@ -48,9 +63,11 @@ def main():
 
     client = CrowdRestClient(url, CROWD_SETTINGS.application_name,
                              CROWD_SETTINGS.application_password, verify=CROWD_SETTINGS.secure)
-
+    crowd_admin_client = CrowdRestClient(url, CROWD_SETTINGS.admin_login,
+                             CROWD_SETTINGS.admin_password, verify=CROWD_SETTINGS.secure)
     dataset = __create_data_set(client)
     write_test_data_to_files(dataset)
+    __check_number_of_custom_app(crowd_admin_client)
 
     print("Finished preparing data")