chore: update analytics data [skip ci]

Reviewed-on: #46
Reviewed-by: Gode, Sebastian <sebastian.gode@t-systems.com>
Co-authored-by: tischrei <tino.schreiber@t-systems.com>
Co-committed-by: tischrei <tino.schreiber@t-systems.com>

.gitea/workflows/create-weekly-analytics-stats.yaml

@@ -49,14 +49,14 @@ jobs:
             --limit "10"
 
       - name: Commit and push results
-        id: commit_step
         run: |
           git config --global user.name "gitea-actions[bot]"
           git config --global user.email "actions@users.noreply.local"
           git checkout -B analytics-update
-          git add analytics/
+          git add otc_metadata/analytics/
           if git diff --cached --quiet; then
+            echo "No changes to commit"
           else
-            git commit -m "chore: update analytics data"
+            git commit -m "chore: update analytics data [skip ci]"
             git push origin analytics-update --force
           fi

otc_metadata/analytics/data.py

@@ -0,0 +1,48 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from pathlib import Path
+import json
+
+BASE_DIR = Path(__file__).resolve().parent
+analytics_path = BASE_DIR / "public"
+
+cloud_environments = [
+    'eu_de',
+    'swiss'
+]
+analytics_data = {k: [] for k in cloud_environments}
+
+# Open and read the json data files
+for env in cloud_environments:
+    file_path = analytics_path / f"{env}.json"
+    with file_path.open(encoding="utf-8") as file:
+        analytics_data[env] = json.load(file)
+
+
+class AnalyticsData(object):
+    """Encapsulate OTC Analystics data"""
+
+    def __init__(self):
+        self._analytics_data = analytics_data
+
+    def all_analytics_data(self):
+        """returns all analytics data"""
+        return self._analytics_data
+
+    def analytics_data_by_cloud_environment(self, cloud_environment):
+        """returns all analytics data"""
+        if cloud_environment and cloud_environment in self._analytics_data:
+            return self._analytics_data[cloud_environment]
+        else:
+            raise ValueError(f"cloud_environment '{cloud_environment}' does not exist.")

otc_metadata/analytics/public/eu_de.json

@@ -7,6 +7,6 @@
   "rds",
   "sfs",
   "iam",
-  "config",
+  "elb",
-  "elb"
+  "vpn"
 ]

otc_metadata/analytics/public/swiss.json

@@ -7,6 +7,6 @@
   "rds",
   "iam",
   "elb",
-  "cbr",
+  "vpn",
-  "vpn"
+  "cbr"
 ]

otc_metadata/services.py

@@ -475,3 +475,33 @@ class Services(object):
         res.sort(key=lambda x: x.get("service_title", "").lower())
 
         return res
+
+    def all_services_by_cloud_environment_as_dict(self, cloud_environment, environments):
+        """Retrieve all services filtered by cloud_environment
+        Returns a dict keyed by service_type.
+        """
+
+        res = {}
+
+        if not (environments and cloud_environment):
+            raise Exception(
+                "No cloud_environment or environments specified in function all_services_by_cloud_environment."
+            )
+
+        for srv in self.all_services:
+            for srv_cloud_environment in srv.get("cloud_environments", []):
+                if srv_cloud_environment.get("name") == cloud_environment:
+                    for environment in environments:
+                        if srv_cloud_environment.get("visibility") == environment:
+                            service_type = srv.get("service_type")
+                            if service_type:
+                                res[service_type] = srv
+                            break
+        res = dict(
+            sorted(
+                res.items(),
+                key=lambda item: item[1].get("service_type", "").lower()
+            )
+        )
+
+        return res

tools/collect_statistics.py

@@ -150,7 +150,7 @@ def save_to_file(data, environment, cloud_environment):
     """
     Saves data in the folder ./analytics/<environment>/<cloud_environment>.json
     """
-    folder = os.path.join("analytics", environment)
+    folder = os.path.join("otc_metadata", "analytics", environment)
     os.makedirs(folder, exist_ok=True)
 
     filename = os.path.join(folder, f"{cloud_environment}.json")