fixing tool generate doc confpy to read additional metadata

.gitignore

@@ -59,6 +59,3 @@ ChangeLog
 
 # Files created by releasenotes build
 releasenotes/build
-
-bindep.txt
-packages.txt

otc_metadata/data/documents/lts-api-ref.yaml

@@ -1,10 +0,0 @@
----
-environment: internal
-hc_location: api/lts
-html_location: docs/lts/api-ref
-link: /log-tank-service/api-ref/
-pdf_name: lts-api-ref
-rst_location: api-ref/source
-service_type: lts
-title: API Reference
-type: api-ref

otc_metadata/data/documents/lts-umn.yaml

@@ -1,10 +0,0 @@
----
-environment: internal
-hc_location: usermanual/lts
-html_location: docs/lts/umn
-link: /log-tank-service/umn/
-pdf_name: lts-umn
-rst_location: umn/source
-service_type: lts
-title: User Guide
-type: umn

otc_metadata/data/service_categories/database.yaml

@@ -1,3 +1,3 @@
 ---
 name: database
-title: Databases
+title: Database

otc_metadata/data/services/lts.yaml

@@ -1,16 +0,0 @@
----
-environment: internal
-repositories:
-- environment: internal
-  repo: docs-swiss/log-tank-service
-  type: gitea
-- environment: public
-  repo: opentelekomcloud-docs-swiss/log-tank-service
-  type: github
-service_category: md
-service_title: Log Tank Service
-service_type: lts
-service_uri: log-tank-service
-teams:
-- name: docs-orchestration-rw
-  permission: write

otc_metadata/data/services/rae.yaml

@@ -1,16 +0,0 @@
----
-environment: hidden
-repositories:
-- environment: internal
-  repo: docs-swiss/regions-and-endpoints
-  type: gitea
-- environment: public
-  repo: opentelekomcloud-docs-swiss/regions-and-endpoints
-  type: github
-service_category: other
-service_title: Regions and Endpoints
-service_type: rae
-service_uri: regions-and-endpoints
-teams:
-- name: docs-eco-rw
-  permission: write

otc_metadata/services.py

@@ -87,13 +87,10 @@ class Services(object):
             res.append(copy.deepcopy(cat))
         return res
 
-    def services_by_category(self, category, environment=None):
+    def services_by_category(self, category):
         """List services matching category"""
         res = []
         for srv in self.all_services:
-            if environment:
-                if "environment" in srv and srv["environment"] != environment:
-                    continue
             if srv["service_category"] == category:
                 res.append(copy.deepcopy(srv))
         return res

otc_metadata/templates/conf.py.j2

@@ -16,8 +16,6 @@
 
 import os
 import sys
-from git import Repo
-from datetime import datetime
 
 extensions = [
     'otcdocstheme',
@@ -48,7 +46,6 @@ otcdocs_service_category = '{{ service_category }}'
 otcdocs_service_title = '{{ service_title }}'
 otcdocs_service_type = '{{ service_type }}'
 otcdocs_search_environment = 'hc_swiss'
-otcdocs_search_index = 'search_index_swiss'
 otcdocs_search_url = "https://opensearch.eco.tsi-dev.otc-service.com/"
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -120,7 +117,6 @@ html_title = "{{ title }}"
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
-templates_path = ['_templates']
 
 # Do not include sources into the rendered results
 html_copy_source = False
@@ -135,21 +131,3 @@ latex_documents = [
 {% endif -%}
 ]
 
-# Get the Git commit values for last updated timestamp on each page
-repo = Repo(search_parent_directories=True)
-commit = repo.head.commit
-current_commit_hash = commit.hexsha
-current_commit_time = commit.committed_datetime.strftime('%Y-%m-%d %H:%M')
-
-latex_elements = {
-  'papersize': 'a4paper',
-  'pointsize': '12pt',
-  'figure_align': 'H',
-  'preamble': rf'''{% raw %}
-        \newcommand{{\githash}}{{{current_commit_hash}}}
-        \newcommand{{\gitcommittime}}{{{current_commit_time}}}
-        \newcommand{{\doctitle}}{{{otcdocs_doc_title}}}
-        \newcommand{{\servicetitle}}{{{otcdocs_service_title}}}{% endraw %}
-  ''',
-  'sphinxsetup': 'hmargin={15mm,15mm}, vmargin={20mm,30mm}, marginpar=10mm'
-}

otc_metadata/templates/doc_requirements.txt.j2

@@ -1,16 +1,7 @@
 sphinx>=2.0.0,!=2.1.0 # BSD
-{% if target_environment == 'public' %}
-otcdocstheme<2.0.0 # Apache-2.0
-{% elif target_environment == 'internal' %}
 otcdocstheme # Apache-2.0
-{% else %}
-otcdocstheme # Apache-2.0
-{% endif %}
 # releasenotes
 reno>=3.1.0 # Apache-2.0
 
 otc-sphinx-directives>=0.1.0
-sphinx-minify>=0.0.1 # Apache-2.0
 git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata-swiss.git#egg=otc_metadata
-setuptools
-gitpython

otc_metadata/templates/index_sbv.rst.j2

@@ -5,4 +5,3 @@
 
    .. service_card::
       :service_type: {{ service_type }}
-      :environment: {{ environment }}

otc_metadata/templates/zuul.yaml.j2

@@ -1,12 +0,0 @@
----
-- project:
-    merge-mode: squash-merge
-    default-branch: main
-    templates:
-      - helpcenter-swiss-base-jobs
-    check:
-      jobs:
-        - noop
-    gate:
-      jobs:
-        - noop

tools/generate_doc_confpy.py

@@ -50,7 +50,6 @@ def process_repositories(args, service):
     )
     conf_py_template = env.get_template("conf.py.j2")
     tox_ini_template = env.get_template("tox.ini.j2")
-    zuul_yaml_template = env.get_template("zuul.yaml.j2")
     index_sbv_template = env.get_template("index_sbv.rst.j2")
     doc_requirements_template = env.get_template("doc_requirements.txt.j2")
 
@@ -149,12 +148,7 @@ def process_repositories(args, service):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",
-                logo_url="https://docs-int.sc.otc.t-systems.com",
-            )
-        else:
-            context["html_options"] = dict(
-                site_name="Swiss Open Telekom Cloud Docs",
-                logo_url="https://docs-beta.sc.otc.t-systems.com",
+                logo_url="https://docs-int.otc-service.com",
             )
         context["doc_environment"] = args.target_environment
         if doc['link']:
@@ -204,14 +198,8 @@ def process_repositories(args, service):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",
-                logo_url="https://docs-int.sc.otc.t-systems.com",
+                logo_url="https://docs-int.otc-service.com",
             )
-        else:
-            context["html_options"] = dict(
-                site_name="Swiss Open Telekom Cloud Docs",
-                logo_url="https://docs-beta.sc.otc.t-systems.com",
-            )
-        context["environment"] = args.target_environment
         sbv_title = (service["service_title"] + "\n"
                      + ('=' * len(service["service_title"])))
         context["sbv_title"] = sbv_title
@@ -249,8 +237,6 @@ def process_repositories(args, service):
                 doc["type"] = "dev-guide"
             context["docs"].append(doc)
 
-        context["target_environment"] = args.target_environment
-
         tox_ini_content = tox_ini_template.render(**context)
         tox_ini_path = pathlib.Path(copy_to, "tox.ini")
         doc_requirements_content = doc_requirements_template.render(**context)
@@ -271,16 +257,6 @@ def process_repositories(args, service):
             out.write(doc_requirements_content)
         repo_to.index.add(["doc/requirements.txt"])
 
-    if args.update_zuul:
-        """Update zuul.yaml"""
-
-        zuul_yaml_content = zuul_yaml_template.render(**context)
-        zuul_yaml_path = pathlib.Path(copy_to, "zuul.yaml")
-        with open(zuul_yaml_path, "w", encoding="utf-8", newline="") as out:
-            logging.debug(f"Generating {zuul_yaml_path} from template...")
-            out.write(zuul_yaml_content)
-        repo_to.index.add(["zuul.yaml"])
-
     if len(repo_to.index.diff("HEAD")) == 0:
         # Nothing to commit
         logging.debug(
@@ -337,7 +313,6 @@ def main():
     parser.add_argument(
         "--target-environment",
         required=True,
-        choices=["internal", "public"],
         help="Environment to be used as a source",
     )
     parser.add_argument("--service-type", help="Service to update")
@@ -366,11 +341,6 @@ def main():
         action="store_true",
         help="Whether to update service-based-view"
     )
-    parser.add_argument(
-        "--update-zuul",
-        action="store_true",
-        help="Whether to update zuul.yaml"
-    )
     parser.add_argument(
         "--overwrite-index-sbv",
         action="store_true",