fix analytics

.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 otc_metadata/analytics/
+          git add analytics/
           if git diff --cached --quiet; then
-            echo "No changes to commit"
           else
-            git commit -m "chore: update analytics data [skip ci]"
+            git commit -m "chore: update analytics data"
             git push origin analytics-update --force
           fi

analytics/public/eu_de.json

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

analytics/public/swiss.json

@@ -8,5 +8,5 @@
   "iam",
   "elb",
   "cbr",
-  "vpc"
+  "vpn"
 ]

otc_metadata/analytics/data.py

@@ -1,47 +0,0 @@
-# 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
-
-analytics_path = Path("otc_metadata/analytics/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.joinpath(f"{env}.json")
-    with open(file_path, 'r') 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/data/cloud_environments/eu_de.yaml

@@ -1,2 +0,0 @@
----
-name: eu_de

otc_metadata/data/cloud_environments/swiss.yaml

@@ -1,2 +0,0 @@
----
-name: swiss

otc_metadata/data/services.yaml

@@ -17,7 +17,6 @@
 # documents/services/service_categories is being merged with
 # the content here.
 ---
-cloud_environments: []
 documents: []
 service_categories: []
 services: []

otc_metadata/services.py

@@ -62,20 +62,10 @@ class Services(object):
         if other in self._service_data["service_categories"]:
             self._service_data["service_categories"].remove(other)
             self._service_data["service_categories"].append(other)
-        # sort cloud environments by <name>
-        self._service_data["cloud_environments"] = sorted(
-            self._service_data["cloud_environments"],
-            key=lambda x: f"{x.get('name')}",
-        )
 
     def _rewrite_data(self):
         otc_metadata.data.rewrite_data("services.yaml", self._service_data)
 
-    @property
-    def all_cloud_environments(self):
-        "Cloud Environments data listing."
-        return copy.deepcopy(self._service_data["cloud_environments"])
-
     @property
     def all_services(self):
         "Service Categories data listing."

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("otc_metadata", "analytics", environment)
+    folder = os.path.join("analytics", environment)
     os.makedirs(folder, exist_ok=True)
 
     filename = os.path.join(folder, f"{cloud_environment}.json")