From f1505b01f39adc7a584b84b00b56e46ad3357387 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 21 Jun 2024 12:19:26 +0000 Subject: [PATCH 1/5] Filter for disable_import --- .../data/documents/asm-best-practice.yaml | 1 + .../documents/blueprints-best-practice.yaml | 1 + otc_metadata/services.py | 4 ++++ tools/generate_docexports_data.py | 17 ++++++++++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/otc_metadata/data/documents/asm-best-practice.yaml b/otc_metadata/data/documents/asm-best-practice.yaml index 7e2815c2..6e00dc11 100644 --- 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 diff --git a/otc_metadata/data/documents/blueprints-best-practice.yaml b/otc_metadata/data/documents/blueprints-best-practice.yaml index 7a464255..0439a8f0 100644 --- 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 diff --git a/otc_metadata/services.py b/otc_metadata/services.py index b89f230d..ced16fdc 100644 --- a/otc_metadata/services.py +++ b/otc_metadata/services.py @@ -278,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) diff --git a/tools/generate_docexports_data.py b/tools/generate_docexports_data.py index 90e44340..dab14334 100644 --- a/tools/generate_docexports_data.py +++ b/tools/generate_docexports_data.py @@ -12,12 +12,27 @@ def main(): data = otc_metadata.services.Services() data._sort_data() + + docs = data.docs_html_by_category("internal") + + # Filter out documents with "disable_import": True + for category, services in docs['categories'].items(): + for service in services: + filtered_docs = [] + + for doc in service['docs']: + # Check if the document does not have 'disable_import' set to True + if not doc.get('disable_import'): + filtered_docs.append(doc) + + service['docs'] = filtered_docs + _yaml = YAML() _yaml.indent(mapping=2, sequence=4, offset=2) sys.stdout.write( "# Auto-generated by otc_metadata.generate_docexports.data\n" ) - _yaml.dump(data.docs_html_by_category("internal"), sys.stdout) + _yaml.dump(docs, sys.stdout) if __name__ == "__main__": -- 2.34.1 From ec7e0f0eab2d044abf17d589764908f5af7e2e41 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 21 Jun 2024 12:28:20 +0000 Subject: [PATCH 2/5] Fix pep8 --- tools/generate_docexports_data.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/generate_docexports_data.py b/tools/generate_docexports_data.py index dab14334..8d583fd0 100644 --- a/tools/generate_docexports_data.py +++ b/tools/generate_docexports_data.py @@ -12,7 +12,6 @@ def main(): data = otc_metadata.services.Services() data._sort_data() - docs = data.docs_html_by_category("internal") # Filter out documents with "disable_import": True @@ -21,7 +20,7 @@ def main(): filtered_docs = [] for doc in service['docs']: - # Check if the document does not have 'disable_import' set to True + # Check if the document doesnt have 'disable_import' on True if not doc.get('disable_import'): filtered_docs.append(doc) -- 2.34.1 From c3562f3c34450f7842d88daea4365032880de1af Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 24 Jun 2024 07:12:40 +0000 Subject: [PATCH 3/5] Add disable_import: true --- otc_metadata/data/documents/bms-image-creation-guide.yaml | 1 + otc_metadata/data/documents/cbr-best-practice.yaml | 1 + otc_metadata/data/documents/cce-best-practice.yaml | 1 + otc_metadata/data/documents/css-best-practice.yaml | 1 + otc_metadata/data/documents/dc-best-practice.yaml | 1 + otc_metadata/data/documents/dcs-best-practice.yaml | 1 + otc_metadata/data/documents/dds-best-practice.yaml | 1 + otc_metadata/data/documents/dli-sqlreference.yaml | 1 + otc_metadata/data/documents/dms-best-practice.yaml | 1 + otc_metadata/data/documents/dns-best-practice.yaml | 1 + otc_metadata/data/documents/drs-best-practice.yaml | 1 + otc_metadata/data/documents/dws-tool-guide.yaml | 1 + otc_metadata/data/documents/ecs-best-practice.yaml | 1 + otc_metadata/data/documents/elb-best-practice.yaml | 1 + otc_metadata/data/documents/evs-best-practice.yaml | 1 + otc_metadata/data/documents/fg-best-practice.yaml | 1 + otc_metadata/data/documents/iam-best-practice.yaml | 1 + otc_metadata/data/documents/ims-best-practice.yaml | 1 + otc_metadata/data/documents/mrs-best-practice.yaml | 1 + otc_metadata/data/documents/natgw-best-practice.yaml | 1 + otc_metadata/data/documents/obs-best-practice.yaml | 1 + otc_metadata/data/documents/sfs-best-practice.yaml | 1 + otc_metadata/data/documents/swr-best-practice.yaml | 1 + otc_metadata/data/documents/tms-best-practice.yaml | 1 + otc_metadata/data/documents/vpc-best-practice.yaml | 1 + otc_metadata/data/documents/wafd-best-practice.yaml | 1 + 26 files changed, 26 insertions(+) diff --git a/otc_metadata/data/documents/bms-image-creation-guide.yaml b/otc_metadata/data/documents/bms-image-creation-guide.yaml index db391e74..728a72ee 100644 --- a/otc_metadata/data/documents/bms-image-creation-guide.yaml +++ b/otc_metadata/data/documents/bms-image-creation-guide.yaml @@ -7,3 +7,4 @@ rst_location: doc/image-creation-guide/source service_type: bms title: Private Image Creation Guide type: image-creation-guide +disable_import: true diff --git a/otc_metadata/data/documents/cbr-best-practice.yaml b/otc_metadata/data/documents/cbr-best-practice.yaml index 79d06ee6..e487dd27 100644 --- 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 diff --git a/otc_metadata/data/documents/cce-best-practice.yaml b/otc_metadata/data/documents/cce-best-practice.yaml index 80d0c715..6d4f7c00 100644 --- 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 diff --git a/otc_metadata/data/documents/css-best-practice.yaml b/otc_metadata/data/documents/css-best-practice.yaml index 1d65810b..66c71aca 100644 --- 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 diff --git a/otc_metadata/data/documents/dc-best-practice.yaml b/otc_metadata/data/documents/dc-best-practice.yaml index 2a60917b..f5ecfe6b 100644 --- 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 diff --git a/otc_metadata/data/documents/dcs-best-practice.yaml b/otc_metadata/data/documents/dcs-best-practice.yaml index c6c760b3..36a04252 100644 --- 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 diff --git a/otc_metadata/data/documents/dds-best-practice.yaml b/otc_metadata/data/documents/dds-best-practice.yaml index 10123d11..2eb38ba3 100644 --- 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 diff --git a/otc_metadata/data/documents/dli-sqlreference.yaml b/otc_metadata/data/documents/dli-sqlreference.yaml index de1ffab2..7d152207 100644 --- a/otc_metadata/data/documents/dli-sqlreference.yaml +++ b/otc_metadata/data/documents/dli-sqlreference.yaml @@ -7,3 +7,4 @@ rst_location: doc/sqlreference/source service_type: dli title: Sql Syntax Reference type: sqlreference +disable_import: true diff --git a/otc_metadata/data/documents/dms-best-practice.yaml b/otc_metadata/data/documents/dms-best-practice.yaml index 0a31750f..484892e9 100644 --- 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 diff --git a/otc_metadata/data/documents/dns-best-practice.yaml b/otc_metadata/data/documents/dns-best-practice.yaml index c19c9f79..e7371805 100644 --- 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 diff --git a/otc_metadata/data/documents/drs-best-practice.yaml b/otc_metadata/data/documents/drs-best-practice.yaml index 2480f200..9181a850 100644 --- 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 diff --git a/otc_metadata/data/documents/dws-tool-guide.yaml b/otc_metadata/data/documents/dws-tool-guide.yaml index 67576f0d..56a06f6b 100644 --- a/otc_metadata/data/documents/dws-tool-guide.yaml +++ b/otc_metadata/data/documents/dws-tool-guide.yaml @@ -7,3 +7,4 @@ rst_location: doc/tool/source service_type: dws title: Tool Guide type: tool-guide +disable_import: true diff --git a/otc_metadata/data/documents/ecs-best-practice.yaml b/otc_metadata/data/documents/ecs-best-practice.yaml index 6a324213..9943d728 100644 --- 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 diff --git a/otc_metadata/data/documents/elb-best-practice.yaml b/otc_metadata/data/documents/elb-best-practice.yaml index 4892745d..13814b58 100644 --- 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 diff --git a/otc_metadata/data/documents/evs-best-practice.yaml b/otc_metadata/data/documents/evs-best-practice.yaml index 4e166bff..b0fbdee6 100644 --- 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 diff --git a/otc_metadata/data/documents/fg-best-practice.yaml b/otc_metadata/data/documents/fg-best-practice.yaml index 7488bba9..416f94b9 100644 --- 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 diff --git a/otc_metadata/data/documents/iam-best-practice.yaml b/otc_metadata/data/documents/iam-best-practice.yaml index 0f0a964b..35b37f7e 100644 --- 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 diff --git a/otc_metadata/data/documents/ims-best-practice.yaml b/otc_metadata/data/documents/ims-best-practice.yaml index fe2c3229..d54c90aa 100644 --- 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 diff --git a/otc_metadata/data/documents/mrs-best-practice.yaml b/otc_metadata/data/documents/mrs-best-practice.yaml index f90a65a8..ce5187ab 100644 --- 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 diff --git a/otc_metadata/data/documents/natgw-best-practice.yaml b/otc_metadata/data/documents/natgw-best-practice.yaml index fb997233..d9656718 100644 --- 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 diff --git a/otc_metadata/data/documents/obs-best-practice.yaml b/otc_metadata/data/documents/obs-best-practice.yaml index 2b7c2c38..86bf89d9 100644 --- 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 diff --git a/otc_metadata/data/documents/sfs-best-practice.yaml b/otc_metadata/data/documents/sfs-best-practice.yaml index defba450..12cd20ca 100644 --- 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 diff --git a/otc_metadata/data/documents/swr-best-practice.yaml b/otc_metadata/data/documents/swr-best-practice.yaml index 43c0f5dd..3fe6618b 100644 --- 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 diff --git a/otc_metadata/data/documents/tms-best-practice.yaml b/otc_metadata/data/documents/tms-best-practice.yaml index 38161588..44910eca 100644 --- 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 diff --git a/otc_metadata/data/documents/vpc-best-practice.yaml b/otc_metadata/data/documents/vpc-best-practice.yaml index 69c8369d..36e61d85 100644 --- 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 diff --git a/otc_metadata/data/documents/wafd-best-practice.yaml b/otc_metadata/data/documents/wafd-best-practice.yaml index fb2bf634..6ea22c81 100644 --- 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 -- 2.34.1 From 6fc0d4e9b0b32fa8b86a3b8161bb8b257659df58 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 24 Jun 2024 08:38:43 +0000 Subject: [PATCH 4/5] Add disable_import: true --- otc_metadata/data/documents/ac-blueprints.yaml | 1 + otc_metadata/data/documents/ac-cloud-adoption-framework.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/otc_metadata/data/documents/ac-blueprints.yaml b/otc_metadata/data/documents/ac-blueprints.yaml index 5ae4248b..0c0f6fb4 100644 --- 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 diff --git a/otc_metadata/data/documents/ac-cloud-adoption-framework.yaml b/otc_metadata/data/documents/ac-cloud-adoption-framework.yaml index cfad6d29..b01d6be3 100644 --- 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 -- 2.34.1 From d96333c8a16fa8f97d47ad270c9cfa7758578ddf Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 24 Jun 2024 12:04:04 +0000 Subject: [PATCH 5/5] Removed disable import from services --- otc_metadata/data/documents/bms-image-creation-guide.yaml | 1 - otc_metadata/data/documents/dli-sqlreference.yaml | 1 - otc_metadata/data/documents/dws-tool-guide.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/otc_metadata/data/documents/bms-image-creation-guide.yaml b/otc_metadata/data/documents/bms-image-creation-guide.yaml index 728a72ee..db391e74 100644 --- a/otc_metadata/data/documents/bms-image-creation-guide.yaml +++ b/otc_metadata/data/documents/bms-image-creation-guide.yaml @@ -7,4 +7,3 @@ rst_location: doc/image-creation-guide/source service_type: bms title: Private Image Creation Guide type: image-creation-guide -disable_import: true diff --git a/otc_metadata/data/documents/dli-sqlreference.yaml b/otc_metadata/data/documents/dli-sqlreference.yaml index 7d152207..de1ffab2 100644 --- a/otc_metadata/data/documents/dli-sqlreference.yaml +++ b/otc_metadata/data/documents/dli-sqlreference.yaml @@ -7,4 +7,3 @@ rst_location: doc/sqlreference/source service_type: dli title: Sql Syntax Reference type: sqlreference -disable_import: true diff --git a/otc_metadata/data/documents/dws-tool-guide.yaml b/otc_metadata/data/documents/dws-tool-guide.yaml index 56a06f6b..67576f0d 100644 --- a/otc_metadata/data/documents/dws-tool-guide.yaml +++ b/otc_metadata/data/documents/dws-tool-guide.yaml @@ -7,4 +7,3 @@ rst_location: doc/tool/source service_type: dws title: Tool Guide type: tool-guide -disable_import: true -- 2.34.1