Merge pull request 'Sync with original repository' (#1 ) from infra/otc-metadata:main into main

Reviewed-on: #1
Removing OBS Swift API from the public documentation
2024-09-03 13:05:52 +00:00 · 2024-09-02 13:33:06 +00:00 · 2024-08-08 10:59:33 +00:00 · 2024-08-06 06:07:56 +00:00 · 2024-08-05 07:27:06 +00:00 · 2024-07-26 07:07:28 +00:00
53 changed files with 171 additions and 11 deletions
--- a/otc_metadata/data/documents/ac-blueprints.yaml
+++ b/otc_metadata/data/documents/ac-blueprints.yaml
@ -6,3 +6,4 @@ rst_location: doc/blueprints/source
 service_type: ac
 title: Blueprints
 type: blueprints
+disable_import: true
--- a/otc_metadata/data/documents/ac-cloud-adoption-framework.yaml
+++ b/otc_metadata/data/documents/ac-cloud-adoption-framework.yaml
@ -6,3 +6,4 @@ rst_location: doc/caf/source
 service_type: ac
 title: Cloud Adoption Framework
 type: caf
+disable_import: true
--- a/otc_metadata/data/documents/apig-dev.yaml
+++ b/otc_metadata/data/documents/apig-dev.yaml
@ -1,4 +1,5 @@
 ---
+environment: hidden
 hc_location: devg/apig
 html_location: docs/apig/dev
 link: /api-gateway/dev-guide/
--- a/otc_metadata/data/documents/apm-umn.yaml
+++ b/otc_metadata/data/documents/apm-umn.yaml
@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 hc_location: usermanual/apm
 html_location: docs/apm/umn
 link: /application-performance-management/umn/
--- a/otc_metadata/data/documents/asm-best-practice.yaml
+++ b/otc_metadata/data/documents/asm-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: asm
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/blueprints-best-practice.yaml
+++ b/otc_metadata/data/documents/blueprints-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: blueprints
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/cbr-best-practice.yaml
+++ b/otc_metadata/data/documents/cbr-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: cbr
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/cce-best-practice.yaml
+++ b/otc_metadata/data/documents/cce-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: cce
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/config-api-ref.yaml
+++ b/otc_metadata/data/documents/config-api-ref.yaml
@ -0,0 +1,10 @@
+---
+environment: internal
+hc_location: api/rms
+html_location: docs/config/api-ref
+link: /config/api-ref/
+pdf_name: config-api-ref
+rst_location: api-ref/source
+service_type: config
+title: API Reference
+type: api-ref
--- a/otc_metadata/data/documents/config-umn.yaml
+++ b/otc_metadata/data/documents/config-umn.yaml
@ -0,0 +1,9 @@
+---
+environment: internal
+hc_location: usermanual/rms
+html_location: docs/config/umn
+link: /config/umn/
+rst_location: umn/source
+service_type: config
+title: User Guide
+type: umn
--- a/otc_metadata/data/documents/css-best-practice.yaml
+++ b/otc_metadata/data/documents/css-best-practice.yaml
@ -7,3 +7,4 @@ rst_location: doc/best-practice/source
 service_type: css
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/dc-best-practice.yaml
+++ b/otc_metadata/data/documents/dc-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: dc
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/dcs-best-practice.yaml
+++ b/otc_metadata/data/documents/dcs-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: dcs
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/dds-best-practice.yaml
+++ b/otc_metadata/data/documents/dds-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: dds
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/dms-best-practice.yaml
+++ b/otc_metadata/data/documents/dms-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: dms
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/dns-best-practice.yaml
+++ b/otc_metadata/data/documents/dns-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: dns
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/drs-best-practice.yaml
+++ b/otc_metadata/data/documents/drs-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: drs
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/ecs-best-practice.yaml
+++ b/otc_metadata/data/documents/ecs-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: ecs
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/elb-best-practice.yaml
+++ b/otc_metadata/data/documents/elb-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: elb
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/evs-best-practice.yaml
+++ b/otc_metadata/data/documents/evs-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: evs
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/fg-best-practice.yaml
+++ b/otc_metadata/data/documents/fg-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: fg
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/geminidb-api-ref.yaml
+++ b/otc_metadata/data/documents/geminidb-api-ref.yaml
@ -1,6 +1,5 @@
 ---
 hc_location: api/nosql
-environment: internal
 html_location: docs/geminidb/api-ref
 link: /geminidb/api-ref/
 pdf_name: geminidb-api-ref
--- a/otc_metadata/data/documents/geminidb-umn.yaml
+++ b/otc_metadata/data/documents/geminidb-umn.yaml
@ -1,5 +1,4 @@
 ---
-environment: internal
 hc_location: usermanual/nosql
 html_location: docs/geminidb/umn
 link: /geminidb/umn/
--- a/otc_metadata/data/documents/hss-api-ref.yaml
+++ b/otc_metadata/data/documents/hss-api-ref.yaml
@ -1,6 +1,5 @@
 ---
 hc_location: api/hss2.0
-environment: internal
 html_location: docs/hss/api-ref
 link: /host-security-service/api-ref/
 pdf_name: hss-api-ref
--- a/otc_metadata/data/documents/hss-umn.yaml
+++ b/otc_metadata/data/documents/hss-umn.yaml
@ -1,6 +1,5 @@
 ---
 hc_location: usermanual/hss2.0
-environment: internal
 html_location: docs/hss/umn
 link: /host-security-service/umn/
 pdf_name: hss-umn
--- a/otc_metadata/data/documents/iam-best-practice.yaml
+++ b/otc_metadata/data/documents/iam-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: iam
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/iam-mycredential.yaml
+++ b/otc_metadata/data/documents/iam-mycredential.yaml
@ -6,3 +6,4 @@ rst_location: doc/mycredential/source
 service_type: iam
 title: My Credential
 type: mycredential
+disable_import: true
--- a/otc_metadata/data/documents/ims-best-practice.yaml
+++ b/otc_metadata/data/documents/ims-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: ims
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/mkp-umn.yaml
+++ b/otc_metadata/data/documents/mkp-umn.yaml
@ -0,0 +1,10 @@
+---
+hc_location: usermanual/mkp
+html_location: docs/mkp/umn
+link: /marketplace/umn/
+pdf_name: mkp-umn
+rst_location: umn/source
+service_type: mkp
+title: User Guide
+type: umn
+disable_import: true
--- a/otc_metadata/data/documents/mrs-best-practice.yaml
+++ b/otc_metadata/data/documents/mrs-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: mrs
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/natgw-best-practice.yaml
+++ b/otc_metadata/data/documents/natgw-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: natgw
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/obs-best-practice.yaml
+++ b/otc_metadata/data/documents/obs-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: obs
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/obs-swiftapi.yaml
+++ b/otc_metadata/data/documents/obs-swiftapi.yaml
@ -1,4 +1,5 @@
 ---
+environment: internal
 hc_location: api_swift/obs
 html_location: docs/obs/api-swift
 link: /object-storage-service/swiftapi/
--- a/otc_metadata/data/documents/rfs-api-ref.yaml
+++ b/otc_metadata/data/documents/rfs-api-ref.yaml
@ -0,0 +1,10 @@
+---
+hc_location: api/rfs
+environment: internal
+html_location: docs/rfs/api-ref
+link: /resource-formation-service/api-ref/
+pdf_name: rfs-api-ref
+rst_location: api-ref/source
+service_type: rfs
+title: API Reference
+type: api-ref
--- a/otc_metadata/data/documents/rfs-umn.yaml
+++ b/otc_metadata/data/documents/rfs-umn.yaml
@ -0,0 +1,10 @@
+---
+hc_location: usermanual/aos
+environment: internal
+html_location: docs/rfs/umn
+link: /resource-formation-service/umn/
+pdf_name: rfs-umn
+rst_location: umn/source
+service_type: rfs
+title: User Guide
+type: umn
--- a/otc_metadata/data/documents/sfs-best-practice.yaml
+++ b/otc_metadata/data/documents/sfs-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: sfs
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/smg-umn.yaml
+++ b/otc_metadata/data/documents/smg-umn.yaml
@ -6,3 +6,4 @@ rst_location: umn/source
 service_type: smg
 title: User Guide
 type: umn
+disable_import: true
--- a/otc_metadata/data/documents/swr-best-practice.yaml
+++ b/otc_metadata/data/documents/swr-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: swr
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/tms-best-practice.yaml
+++ b/otc_metadata/data/documents/tms-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: tms
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/vpc-best-practice.yaml
+++ b/otc_metadata/data/documents/vpc-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: vpc
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/documents/wafd-best-practice.yaml
+++ b/otc_metadata/data/documents/wafd-best-practice.yaml
@ -8,3 +8,4 @@ rst_location: doc/best-practice/source
 service_type: wafd
 title: Best Practice
 type: best-practice
+disable_import: true
--- a/otc_metadata/data/services/antiddos.yaml
+++ b/otc_metadata/data/services/antiddos.yaml
@ -8,7 +8,7 @@ repositories:
  repo: opentelekomcloud-docs/anti-ddos
  type: github
 service_category: security-services
-service_title: Anti DDoS
+service_title: Anti-DDoS
 service_type: antiddos
 service_uri: anti-ddos
 teams:
--- a/otc_metadata/data/services/apm.yaml
+++ b/otc_metadata/data/services/apm.yaml
@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 repositories:
 - environment: internal
  repo: docs/application-performance-management
--- a/otc_metadata/data/services/config.yaml
+++ b/otc_metadata/data/services/config.yaml
@ -0,0 +1,16 @@
+---
+environment: internal
+repositories:
+- environment: internal
+  repo: docs/config
+  type: gitea
+- environment: public
+  repo: opentelekomcloud-docs/config
+  type: github
+service_category: md
+service_title: Config
+service_type: config
+service_uri: config
+teams:
+- name: docs-orchestration-rw
+  permission: write
--- a/otc_metadata/data/services/geminidb.yaml
+++ b/otc_metadata/data/services/geminidb.yaml
@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 repositories:
 - environment: internal
  repo: docs/geminidb
--- a/otc_metadata/data/services/hss.yaml
+++ b/otc_metadata/data/services/hss.yaml
@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 repositories:
 - environment: internal
  repo: docs/host-security-service
--- a/otc_metadata/data/services/mkp.yaml
+++ b/otc_metadata/data/services/mkp.yaml
@ -0,0 +1,16 @@
+---
+environment: public
+repositories:
+- environment: internal
+  repo: docs/marketplace
+  type: gitea
+- environment: public
+  repo: opentelekomcloud-docs/marketplace
+  type: github
+service_category: other
+service_title: Marketplace
+service_type: mkp
+service_uri: marketplace
+teams:
+- name: docs-3rd-party-integration-rw
+  permission: write
--- a/otc_metadata/data/services/notfound.yaml
+++ b/otc_metadata/data/services/notfound.yaml
@ -0,0 +1,13 @@
+---
+environment: hidden
+repositories:
+- environment: public
+  repo: opentelekomcloud-docs/page-not-found
+  type: github
+service_category: other
+service_title: Page Not Found
+service_type: pagenotfound
+service_uri: page-not-found
+teams:
+- name: docs-eco-rw
+  permission: write
--- a/otc_metadata/data/services/rfs.yaml
+++ b/otc_metadata/data/services/rfs.yaml
@ -0,0 +1,16 @@
+---
+environment: internal
+repositories:
+- environment: internal
+  repo: docs/resource-formation-service
+  type: gitea
+- environment: public
+  repo: opentelekomcloud-docs/resource-formation-service
+  type: github
+service_category: application
+service_title: Resource Formation Service
+service_type: rfs
+service_uri: resource-formation-service
+teams:
+- name: docs-orchestration-rw
+  permission: write
--- a/otc_metadata/services.py
+++ b/otc_metadata/services.py
@ -87,10 +87,13 @@ class Services(object):
            res.append(copy.deepcopy(cat))
        return res

-    def services_by_category(self, category):
+    def services_by_category(self, category, environment=None):
        """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
@ -275,6 +278,10 @@ class Services(object):
                        doc_res["pdf_name"] = doc["pdf_name"]
                    if "hc_location" in doc:
                        doc_res["hc_location"] = doc["hc_location"]
+                    if "disable_import" in doc:
+                        doc_res["disable_import"] = doc["disable_import"]
+                    else:
+                        doc_res["disable_import"] = False
                    srv_res["docs"].append(doc_res)
            if len(srv_res["docs"]) > 0:
                doc_struct[srv["service_category"]].append(srv_res)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sabelnikov, Dmitriy	6a07672627	Merge pull request 'Sync with original repository' (#1 ) from infra/otc-metadata:main into main Reviewed-on: #1	2024-09-03 13:05:52 +00:00
Sabelnikov, Dmitriy	0cc28b7d0b	Removing OBS Swift API from the public documentation Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Sabelnikov, Dmitriy <dmitriy.sabelnikov@t-systems.com> Co-committed-by: Sabelnikov, Dmitriy <dmitriy.sabelnikov@t-systems.com>	2024-09-02 13:33:06 +00:00
Hasko, Vladimir	406302b448	adding rfs metadata Reviewed-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-authored-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-committed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>	2024-08-08 10:59:33 +00:00
Hasko, Vladimir	5773230496	Update 'otc_metadata/data/documents/smg-umn.yaml' Reviewed-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-authored-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-committed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>	2024-08-06 06:07:56 +00:00
Hasko, Vladimir	42855482cf	currently not Huawei supported doc Reviewed-by: vladimirvshivkov <vshivkovvladimir@gmail.com> Co-authored-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-committed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>	2024-08-05 07:27:06 +00:00
Hasko, Vladimir	1b97e9d76a	enable-geminidb Reviewed-by: vladimirvshivkov <vshivkovvladimir@gmail.com> Co-authored-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-committed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>	2024-07-26 07:07:28 +00:00
Hasko, Vladimir	09c2e869d0	making geminidb public visible Reviewed-by: vladimirvshivkov <vshivkovvladimir@gmail.com> Co-authored-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-committed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>	2024-07-25 16:25:58 +00:00
Hasko, Vladimir	63eb1b715e	Fixing missing env entry Reviewed-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-authored-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-committed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>	2024-07-23 09:18:21 +00:00
Gode, Sebastian	a9ae65958d	Set environment for SBV internally automatically to internal Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-committed-by: Gode, Sebastian <sebastian.gode@t-systems.com>	2024-07-23 06:58:32 +00:00
Meshki, Abalfazl	3ae8e7a8be	mkp-public Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Meshki, Abalfazl <a200263171@noreply.gitea.eco.tsi-dev.otc-service.com> Co-committed-by: Meshki, Abalfazl <a200263171@noreply.gitea.eco.tsi-dev.otc-service.com>	2024-07-22 12:47:41 +00:00
tischrei	9746bb1892	Update 'otc_metadata/data/services/antiddos.yaml' 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>	2024-07-19 12:50:12 +00:00
tischrei	2105405796	create Page Not Found service 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>	2024-07-09 08:58:50 +00:00
Hasko, Vladimir	98dc53c075	fixing typo in rst path Reviewed-by: otcbot <otcbot@t-systems.com> Co-authored-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-committed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>	2024-06-27 12:22:54 +00:00
Engelbracht, Keno	8f5bb1035c	add marketplace barebones to docs Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Engelbracht, Keno <a22549483@noreply.gitea.eco.tsi-dev.otc-service.com> Co-committed-by: Engelbracht, Keno <a22549483@noreply.gitea.eco.tsi-dev.otc-service.com>	2024-06-27 07:41:37 +00:00
Gode, Sebastian	cc0c94a163	Filter for disable_import Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-committed-by: Gode, Sebastian <sebastian.gode@t-systems.com>	2024-06-24 12:35:13 +00:00
Gode, Sebastian	00fd8fd30b	Added Config Service Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-committed-by: Gode, Sebastian <sebastian.gode@t-systems.com>	2024-06-24 07:54:08 +00:00
Gode, Sebastian	92db132b39	APM to public Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-committed-by: Gode, Sebastian <sebastian.gode@t-systems.com>	2024-06-18 09:01:42 +00:00
Gode, Sebastian	233afc5d06	APIG Dev-Guide to hidden Reviewed-by: tischrei <tino.schreiber@t-systems.com> Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-committed-by: Gode, Sebastian <sebastian.gode@t-systems.com>	2024-06-03 13:06:22 +00:00
Gode, Sebastian	f217cafb1b	Add environment filter to services_by_category Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Gode, Sebastian <sebastian.gode@t-systems.com> Co-committed-by: Gode, Sebastian <sebastian.gode@t-systems.com>	2024-05-29 10:59:13 +00:00
Belejkanic, Lukas	663cfbed75	hss api &um public Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com> Co-authored-by: Belejkanic, Lukas <lukas.belejkanic@t-systems.com> Co-committed-by: Belejkanic, Lukas <lukas.belejkanic@t-systems.com>	2024-05-29 10:15:18 +00:00