From 879317eb6f67b4ea4ccc8cf204d403543dab5348 Mon Sep 17 00:00:00 2001 From: tischrei Date: Fri, 14 Feb 2025 08:48:39 +0000 Subject: [PATCH 1/6] Update otc_metadata/data/documents/dbss-api-ref.yaml Reviewed-by: Gode, Sebastian Co-authored-by: tischrei Co-committed-by: tischrei --- otc_metadata/data/documents/dbss-api-ref.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/otc_metadata/data/documents/dbss-api-ref.yaml b/otc_metadata/data/documents/dbss-api-ref.yaml index 824bb3b0..344c52cb 100644 --- a/otc_metadata/data/documents/dbss-api-ref.yaml +++ b/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/ From 6f9af80531b95831f22a85af07f8a39f55209370 Mon Sep 17 00:00:00 2001 From: Natalia Bobkova Date: Fri, 14 Feb 2025 12:59:57 +0000 Subject: [PATCH 2/6] rfs tags hidden Reviewed-by: Hasko, Vladimir Co-authored-by: Natalia Bobkova Co-committed-by: Natalia Bobkova --- otc_metadata/data/documents/rfs-umn.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/otc_metadata/data/documents/rfs-umn.yaml b/otc_metadata/data/documents/rfs-umn.yaml index 36b098f2..364335ba 100644 --- a/otc_metadata/data/documents/rfs-umn.yaml +++ b/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 From 7ad18dfa57ad3a3f47c8a2ed3e00e3c661396c5d Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Wed, 19 Feb 2025 17:54:07 +0000 Subject: [PATCH 3/6] RFS to public Reviewed-by: Tino Schreiber Co-authored-by: Sebastian Gode Co-committed-by: Sebastian Gode --- otc_metadata/data/documents/rfs-api-ref.yaml | 2 +- otc_metadata/data/services/rfs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/otc_metadata/data/documents/rfs-api-ref.yaml b/otc_metadata/data/documents/rfs-api-ref.yaml index 4d26aede..77dbdcaf 100644 --- a/otc_metadata/data/documents/rfs-api-ref.yaml +++ b/otc_metadata/data/documents/rfs-api-ref.yaml @@ -1,6 +1,6 @@ --- hc_location: api/aos -environment: internal +environment: public html_location: docs/rfs/api-ref link: /resource-formation-service/api-ref/ pdf_enabled: true diff --git a/otc_metadata/data/services/rfs.yaml b/otc_metadata/data/services/rfs.yaml index d061df96..c3acbded 100644 --- a/otc_metadata/data/services/rfs.yaml +++ b/otc_metadata/data/services/rfs.yaml @@ -1,5 +1,5 @@ --- -environment: internal +environment: public repositories: - environment: internal repo: docs/resource-formation-service From dbc6d6d4002ad94be6c90b72857880f84bff554a Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Thu, 20 Feb 2025 08:30:11 +0000 Subject: [PATCH 4/6] RFS-API to internal Reviewed-by: Tino Schreiber Co-authored-by: Sebastian Gode Co-committed-by: Sebastian Gode --- otc_metadata/data/documents/rfs-api-ref.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otc_metadata/data/documents/rfs-api-ref.yaml b/otc_metadata/data/documents/rfs-api-ref.yaml index 77dbdcaf..4d26aede 100644 --- a/otc_metadata/data/documents/rfs-api-ref.yaml +++ b/otc_metadata/data/documents/rfs-api-ref.yaml @@ -1,6 +1,6 @@ --- hc_location: api/aos -environment: public +environment: internal html_location: docs/rfs/api-ref link: /resource-formation-service/api-ref/ pdf_enabled: true From 07c4edd50330db68f32710c21852b6d254869e62 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 25 Feb 2025 11:25:08 +0000 Subject: [PATCH 5/6] Swiss confpy changes Reviewed-by: Tino Schreiber Co-authored-by: Sebastian Gode Co-committed-by: Sebastian Gode --- tools/generate_doc_confpy.py | 26 ++++++++++++++++++++++---- tox.ini | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index 385a3c1f..2bd5d8f2 100644 --- a/tools/generate_doc_confpy.py +++ b/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", diff --git a/tox.ini b/tox.ini index 3b5961d1..74aa87e1 100644 --- a/tox.ini +++ b/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 From 766bc0dda4b8a87ed13a6b03a16c8b9752922854 Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Tue, 4 Mar 2025 08:38:55 +0000 Subject: [PATCH 6/6] making api usage guidelines public Reviewed-by: Tino Schreiber Co-authored-by: Hasko, Vladimir Co-committed-by: Hasko, Vladimir --- otc_metadata/data/documents/apiu-guidelines.yaml | 1 - otc_metadata/data/services/apiu.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/otc_metadata/data/documents/apiu-guidelines.yaml b/otc_metadata/data/documents/apiu-guidelines.yaml index e229b7e7..7ae4f726 100644 --- a/otc_metadata/data/documents/apiu-guidelines.yaml +++ b/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/ diff --git a/otc_metadata/data/services/apiu.yaml b/otc_metadata/data/services/apiu.yaml index 9019c794..584c60e0 100644 --- a/otc_metadata/data/services/apiu.yaml +++ b/otc_metadata/data/services/apiu.yaml @@ -1,5 +1,5 @@ --- -environment: internal +environment: hidden repositories: - environment: internal repo: docs/api-usage