From 3e42a73cb8f334e5e7355355e7f5636f74f71411 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Sat, 10 Feb 2024 12:57:38 -0500 Subject: [PATCH 1/5] chore: add library params --- library_generation/model/library_config.py | 2 ++ library_generation/utilities.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/library_generation/model/library_config.py b/library_generation/model/library_config.py index 9e3f9c9c61..1418f74fb2 100644 --- a/library_generation/model/library_config.py +++ b/library_generation/model/library_config.py @@ -33,6 +33,7 @@ def __init__( release_level: Optional[str] = None, api_id: Optional[str] = None, api_reference: Optional[str] = None, + codeowner_team: Optional[str] = None, client_documentation: Optional[str] = None, distribution_name: Optional[str] = None, googleapis_commitish: Optional[str] = None, @@ -53,6 +54,7 @@ def __init__( self.release_level = release_level if release_level else "preview" self.api_id = api_id self.api_reference = api_reference + self.codeowner_team = codeowner_team self.client_documentation = client_documentation self.distribution_name = distribution_name self.googleapis_commitish = googleapis_commitish diff --git a/library_generation/utilities.py b/library_generation/utilities.py index 014b95ae8e..52cfcc214b 100755 --- a/library_generation/utilities.py +++ b/library_generation/utilities.py @@ -390,6 +390,8 @@ def generate_prerequisite_files( if library.api_reference: repo_metadata["api_reference"] = library.api_reference + if library.codeowner_team: + repo_metadata["codeowner_team"] = library.codeowner_team if library.issue_tracker: repo_metadata["issue_tracker"] = library.issue_tracker if library.rest_documentation: From 58aa544ec15bd310ee6bf573a202e39f97a2ba33 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 12 Feb 2024 10:48:56 -0500 Subject: [PATCH 2/5] add params excluded_dependencies and excluded_poms --- library_generation/model/library_config.py | 4 ++++ library_generation/utilities.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/library_generation/model/library_config.py b/library_generation/model/library_config.py index 1418f74fb2..9d281b912c 100644 --- a/library_generation/model/library_config.py +++ b/library_generation/model/library_config.py @@ -36,6 +36,8 @@ def __init__( codeowner_team: Optional[str] = None, client_documentation: Optional[str] = None, distribution_name: Optional[str] = None, + excluded_dependencies: Optional[str] = None, + excluded_poms: Optional[str] = None, googleapis_commitish: Optional[str] = None, group_id: Optional[str] = "com.google.cloud", issue_tracker: Optional[str] = None, @@ -55,6 +57,8 @@ def __init__( self.api_id = api_id self.api_reference = api_reference self.codeowner_team = codeowner_team + self.excluded_dependencies = excluded_dependencies + self.excluded_poms = excluded_poms self.client_documentation = client_documentation self.distribution_name = distribution_name self.googleapis_commitish = googleapis_commitish diff --git a/library_generation/utilities.py b/library_generation/utilities.py index 52cfcc214b..d899dd1773 100755 --- a/library_generation/utilities.py +++ b/library_generation/utilities.py @@ -392,6 +392,10 @@ def generate_prerequisite_files( repo_metadata["api_reference"] = library.api_reference if library.codeowner_team: repo_metadata["codeowner_team"] = library.codeowner_team + if library.excluded_dependencies: + repo_metadata["excluded_dependencies"] = library.excluded_dependencies + if library.excluded_poms: + repo_metadata["excluded_poms"] = library.excluded_poms if library.issue_tracker: repo_metadata["issue_tracker"] = library.issue_tracker if library.rest_documentation: From 33ec893949488134601bc08851aa048d3af03d43 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 12 Feb 2024 12:20:47 -0500 Subject: [PATCH 3/5] add unit test --- .../test/resources/test-config/generation_config.yaml | 3 +++ library_generation/test/unit_tests.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/library_generation/test/resources/test-config/generation_config.yaml b/library_generation/test/resources/test-config/generation_config.yaml index b73fa4d65d..8ec1d3f1b5 100644 --- a/library_generation/test/resources/test-config/generation_config.yaml +++ b/library_generation/test/resources/test-config/generation_config.yaml @@ -26,6 +26,9 @@ libraries: release_level: "stable" issue_tracker: "https://issuetracker.google.com/issues/new?component=187210&template=0" api_reference: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview" + codeowner_team: @googleapis/analytics-dpe + excluded_poms: proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1 + excluded_dependencies: "google-iam-policy" GAPICs: - proto_path: google/cloud/asset/v1 - proto_path: google/cloud/asset/v1p1beta1 diff --git a/library_generation/test/unit_tests.py b/library_generation/test/unit_tests.py index 04bcd46ccb..a55cf7f6b5 100644 --- a/library_generation/test/unit_tests.py +++ b/library_generation/test/unit_tests.py @@ -192,6 +192,12 @@ def test_from_yaml_succeeds(self): library.api_description, ) self.assertEqual("asset", library.library_name) + self.assertEqual("@googleapis/analytics-dpe", library.codeowner_team) + self.assertEqual( + "proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1", + library.excluded_poms, + ) + self.assertEqual("google-iam-policy", library.excluded_dependencies) gapics = library.gapic_configs self.assertEqual(5, len(gapics)) self.assertEqual("google/cloud/asset/v1", gapics[0].proto_path) From f2731a2778c1a12a11071bf537434b5843c22ca7 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 12 Feb 2024 12:22:23 -0500 Subject: [PATCH 4/5] fix test config --- .../test/resources/test-config/generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library_generation/test/resources/test-config/generation_config.yaml b/library_generation/test/resources/test-config/generation_config.yaml index 8ec1d3f1b5..de31b72c01 100644 --- a/library_generation/test/resources/test-config/generation_config.yaml +++ b/library_generation/test/resources/test-config/generation_config.yaml @@ -26,7 +26,7 @@ libraries: release_level: "stable" issue_tracker: "https://issuetracker.google.com/issues/new?component=187210&template=0" api_reference: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview" - codeowner_team: @googleapis/analytics-dpe + codeowner_team: "@googleapis/analytics-dpe" excluded_poms: proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1 excluded_dependencies: "google-iam-policy" GAPICs: From 04ad5efde5950513b1eab59a8dfb51e4e0ea1f7c Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 12 Feb 2024 13:08:31 -0500 Subject: [PATCH 5/5] fix unit test --- library_generation/model/generation_config.py | 3 +++ .../test/resources/test-config/generation_config.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/library_generation/model/generation_config.py b/library_generation/model/generation_config.py index b6c82f6e26..3a59958a63 100644 --- a/library_generation/model/generation_config.py +++ b/library_generation/model/generation_config.py @@ -79,6 +79,9 @@ def from_yaml(path_to_yaml: str) -> GenerationConfig: release_level=__optional(library, "release_level", "preview"), api_id=__optional(library, "api_id", None), api_reference=__optional(library, "api_reference", None), + codeowner_team=__optional(library, "codeowner_team", None), + excluded_poms=__optional(library, "excluded_poms", None), + excluded_dependencies=__optional(library, "excluded_dependencies", None), client_documentation=__optional(library, "client_documentation", None), distribution_name=__optional(library, "distribution_name", None), googleapis_commitish=__optional(library, "googleapis_commitish", None), diff --git a/library_generation/test/resources/test-config/generation_config.yaml b/library_generation/test/resources/test-config/generation_config.yaml index de31b72c01..d84ed3afd2 100644 --- a/library_generation/test/resources/test-config/generation_config.yaml +++ b/library_generation/test/resources/test-config/generation_config.yaml @@ -28,7 +28,7 @@ libraries: api_reference: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview" codeowner_team: "@googleapis/analytics-dpe" excluded_poms: proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1 - excluded_dependencies: "google-iam-policy" + excluded_dependencies: google-iam-policy GAPICs: - proto_path: google/cloud/asset/v1 - proto_path: google/cloud/asset/v1p1beta1