make ASM api-ref public

Reviewed-by: Tino Schreiber <tino.schreiber@t-systems.com>
Co-authored-by: Natalia Bobkova <natalia.bobkova@t-systems.com>
Co-committed-by: Natalia Bobkova <natalia.bobkova@t-systems.com>

otc_metadata/data/documents/apiu-guidelines.yaml

@@ -1,5 +1,4 @@
 ---
-environment: internal
 hc_location: api-usage/guidelines
 html_location: docs/apiu/guidelines
 link: /api-usage/guidelines/

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

@@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 hc_location: api/asm
 html_location: docs/asm/api-ref
 link: /application-service-mesh/api-ref/

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

@@ -2,7 +2,7 @@
 hc_location: api2/cce
 html_location: docs/cce/api-ref
 link: /cloud-container-engine/api-ref/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: api-ref/source
 service_type: cce

otc_metadata/data/documents/cce-best-practice.yaml

@@ -3,7 +3,7 @@ hc_location: bestpractice/cce
 environment: internal
 html_location: docs/cce/best-practice
 link: /cloud-container-engine/best-practice/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: doc/best-practice/source
 service_type: cce

otc_metadata/data/documents/cce-umn.yaml

@@ -2,7 +2,7 @@
 hc_location: usermanual2/cce
 html_location: docs/cce/umn
 link: /cloud-container-engine/umn/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: umn/source
 service_type: cce

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

@@ -0,0 +1,11 @@
+---
+environment: internal
+hc_location: api/cc
+html_location: docs/ccn/api-ref
+link: /cloud-connect/api-ref/
+pdf_enabled: true
+pdf_environment: internal
+rst_location: api-ref/source
+service_type: ccn
+title: API Reference
+type: api-ref

otc_metadata/data/documents/ccn-umn.yaml

@@ -0,0 +1,11 @@
+---
+environment: internal
+hc_location: usermanual/cc
+html_location: docs/ccn/umn
+link: /cloud-connect/umn/
+pdf_enabled: true
+pdf_environment: internal
+rst_location: umn/source
+service_type: ccn
+title: User Guide
+type: umn

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

@@ -1,5 +1,4 @@
 ---
-environment: internal
 hc_location: api/cfw
 html_location: docs/cfw/api-ref
 link: /cloud-firewall/api-ref/

otc_metadata/data/documents/cfw-umn.yaml

@@ -1,5 +1,4 @@
 ---
-environment: internal
 hc_location: usermanual/cfw
 html_location: docs/cfw/umn
 link: /cloud-firewall/umn/

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

@@ -0,0 +1,11 @@
+---
+hc_location: api/das
+environment: internal
+html_location: docs/das/api-ref
+link: /data-admin-service/api-ref/
+pdf_enabled: true
+pdf_environment: internal
+rst_location: api-ref/source
+service_type: das
+title: API Reference
+type: api-ref

otc_metadata/data/documents/das-umn.yaml

@@ -0,0 +1,11 @@
+---
+hc_location: usermanual/das
+environment: internal
+html_location: docs/das/umn
+link: /data-admin-service/umn/
+pdf_enabled: true
+pdf_environment: internal
+rst_location: umn/source
+service_type: das
+title: User Guide
+type: umn

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

@@ -1,4 +1,5 @@
 ---
+environment: internal
 hc_location: api/dbss
 html_location: docs/dbss/api-ref
 link: /database-security-service/api-ref/

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

@@ -2,7 +2,7 @@
 hc_location: api/evs
 html_location: docs/evs/api-ref
 link: /elastic-volume-service/api-ref/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: api-ref/source
 service_type: evs

otc_metadata/data/documents/evs-best-practice.yaml

@@ -3,7 +3,7 @@ hc_location: bestpractice/evs
 environment: internal
 html_location: docs/evs/best-practice
 link: /elastic-volume-service/best-practice/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: doc/best-practice/source
 service_type: evs

otc_metadata/data/documents/evs-dev.yaml

@@ -2,7 +2,7 @@
 hc_location: devg/evs
 html_location: docs/evs/dev
 link: /elastic-volume-service/dev-guide/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: dev_guide/source
 service_type: evs

otc_metadata/data/documents/evs-umn.yaml

@@ -2,7 +2,7 @@
 hc_location: usermanual/evs
 html_location: docs/evs/umn
 link: /elastic-volume-service/umn/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: umn/source
 service_type: evs

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

@@ -2,7 +2,7 @@
 hc_location: api/mrs
 html_location: docs/mrs/api-ref
 link: /mapreduce-service/api-ref/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: api-ref/source
 service_type: mrs

otc_metadata/data/documents/mrs-best-practice.yaml

@@ -3,7 +3,7 @@ hc_location: bestpractice/mrs
 environment: internal
 html_location: docs/mrs/best-practice
 link: /mapreduce-service/best-practice/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: doc/best-practice/source
 service_type: mrs

otc_metadata/data/documents/mrs-operation-guide-lts.yaml

@@ -2,7 +2,7 @@
 hc_location: cmpntguide-lts/mrs
 html_location: docs/mrs/component-operation-guide-lts
 link: /mapreduce-service/operation-guide-lts/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: doc/component-operation-guide-lts/source
 service_type: mrs

otc_metadata/data/documents/mrs-operation-guide.yaml

@@ -2,7 +2,7 @@
 hc_location: cmpntguide/mrs
 html_location: docs/mrs/component-operation-guide
 link: /mapreduce-service/operation-guide/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: doc/component-operation-guide/source
 service_type: mrs

otc_metadata/data/documents/mrs-umn.yaml

@@ -2,7 +2,7 @@
 hc_location: usermanual/mrs
 html_location: docs/mrs/umn
 link: /mapreduce-service/umn/
-pdf_enabled: true
+pdf_enabled: false
 pdf_environment: internal
 rst_location: umn/source
 service_type: mrs

otc_metadata/data/documents/rfs-umn.yaml

@@ -1,10 +1,10 @@
 ---
 hc_location: usermanual/aos
-environment: internal
+environment: public
 html_location: docs/rfs/umn
 link: /resource-formation-service/umn/
-pdf_enabled: true
 pdf_environment: internal
+pdf_enabled: true
 rst_location: umn/source
 service_type: rfs
 title: User Guide

otc_metadata/data/services/apiu.yaml

@@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: hidden
 repositories:
 - environment: internal
   repo: docs/api-usage

otc_metadata/data/services/ccn.yaml

@@ -0,0 +1,16 @@
+---
+environment: internal
+repositories:
+- environment: internal
+  repo: docs/cloud-connect
+  type: gitea
+- environment: public
+  repo: opentelekomcloud-docs/cloud-connect
+  type: github
+service_category: network
+service_title: Cloud Connect
+service_type: ccn
+service_uri: cloud-connect
+teams:
+- name: docs-network-rw
+  permission: write

otc_metadata/data/services/cfw.yaml

@@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 repositories:
 - environment: internal
   repo: docs/cloud-firewall

otc_metadata/data/services/das.yaml

@@ -0,0 +1,16 @@
+---
+environment: internal
+repositories:
+- environment: internal
+  repo: docs/data-admin-service
+  type: gitea
+- environment: public
+  repo: opentelekomcloud-docs/data-admin-service
+  type: github
+service_category: database
+service_title: Data Admin Service
+service_type: das
+service_uri: data-admin-service
+teams:
+- name: docs-database-rw
+  permission: write

otc_metadata/data/services/rfs.yaml

@@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 repositories:
 - environment: internal
   repo: docs/resource-formation-service
@@ -7,7 +7,7 @@ repositories:
 - environment: public
   repo: opentelekomcloud-docs/resource-formation-service
   type: github
-service_category: application
+service_category: md
 service_title: Resource Formation Service
 service_type: rfs
 service_uri: resource-formation-service

otc_metadata/templates/tox.ini.j2

@@ -44,6 +44,7 @@ commands =
   {[testenv:json-{{ doc.type }}]commands}
 {%- endfor %}
 
+{% if docs|length > 0 %}
 [testenv:pdf-docs]
 deps =
   {[testenv:docs]deps}
@@ -57,6 +58,7 @@ allowlist_externals =
   cp
 commands =
   mkdir -p doc/build/pdf
+  mkdir -p doc/build/html
   {[testenv:bindeps]commands}
   mkdir -p {toxinidir}/_templates
   wget -O {toxinidir}/_templates/longtable.tex.jinja https://gitea.eco.tsi-dev.otc-service.com/infra/docs-templates/raw/branch/main/templates/longtable.tex.jinja
@@ -67,6 +69,7 @@ commands =
   {[testenv:{{ doc.type }}-pdf-docs]commands}
 {%- endif %}
 {%- endfor %}
+{% endif %}
 
 {% for doc in docs -%}
 {% set loc = doc.rst_location | replace('/source', '') %}
@@ -107,7 +110,6 @@ commands =
   cp -av doc/build/json/{{ doc.type }} {{ doc.type }}/build/json
 {%- endif %}
 
-{% if doc.pdf_enabled -%}
 # PDF version
 [testenv:{{ doc.type }}-pdf-docs]
 deps = {[testenv:docs]deps}
@@ -121,12 +123,12 @@ commands =
   rm -rf {{ loc }}/build/pdf
   cp -r {toxinidir}/_templates {{ loc }}/source/_templates/
   sphinx-build -W --keep-going -b latex {{ loc }}/source {{ loc }}/build/pdf/
-  bash -c "for f in {{ loc }}/build/pdf/*.gif; do convert $f $\{f/%gif/png\}; done || true"
+  bash -c "for f in {{ loc }}/build/pdf/*.gif; do convert $f[0] $\{f/%gif/png\}; done || true"
   bash -c "for f in {{ loc }}/build/pdf/*.tex; do sed -iorig 's/\.gif//g' $f; done"
-  make -C {{ loc }}/build/pdf
+  make -C {{ loc }}/build/pdf LATEXMKOPTS="-interaction=nonstopmode"
   mkdir -p doc/build/pdf
   cp {{ loc }}/build/pdf/{{ service_type }}-{{ doc.type }}.pdf doc/build/pdf/
-{% endif %}
+  cp {{ loc }}/build/pdf/{{ service_type }}-{{ doc.type }}.pdf doc/build/html/
 {% endfor %}
 
 [testenv:bindeps]

tools/generate_doc_confpy.py

@@ -167,8 +167,17 @@ def process_repositories(args, service):
             context["git_fqdn"] = git_fqdn
         if target_repo.get("type") != "github":
             context["git_type"] = target_repo["type"]
-        if (args.target_environment == "internal"
-           and target_repo["repo"].split("/")[0] == "docs-swiss"):
+        if (args.target_environment == "public"
+           and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"):
+            context["html_options"] = dict(
+                logo_url="https://docs.sc.otc.t-systems.com",
+            )
+        elif (args.target_environment == "public"):
+            context["html_options"] = dict(
+                logo_url="https://docs.otc.t-systems.com",
+            )
+        elif (args.target_environment == "internal"
+              and target_repo["repo"].split("/")[0] == "docs-swiss"):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",
@@ -224,8 +233,17 @@ def process_repositories(args, service):
             context["git_fqdn"] = git_fqdn
         if target_repo.get("type") != "github":
             context["git_type"] = target_repo["type"]
-        if (args.target_environment == "internal"
-           and target_repo["repo"].split("/")[0] == "docs-swiss"):
+        if (args.target_environment == "public"
+           and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"):
+            context["html_options"] = dict(
+                logo_url="https://docs.sc.otc.t-systems.com",
+            )
+        elif (args.target_environment == "public"):
+            context["html_options"] = dict(
+                logo_url="https://docs.otc.t-systems.com",
+            )
+        elif (args.target_environment == "internal"
+              and target_repo["repo"].split("/")[0] == "docs-swiss"):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",

tox.ini

@@ -20,6 +20,6 @@ commands = {posargs}
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 show-source = True
-ignore = E123,E125,W503
+ignore = E123,E125,W503,E501
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build