chore: simplify hiding samples

googleapis · Apr 2, 2019 · 6428220 · 6428220
1 parent 1b57231
commit 6428220
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/synthtool/gcp/common.py b/synthtool/gcp/common.py
@@ -40,10 +40,6 @@ def _generic_library(self, directory: str, **kwargs) -> Path:
         # load common repo meta information (metadata that's not language specific).
         if "metadata" in kwargs:
             self._load_generic_metadata(kwargs["metadata"])
-            # if no samples were found, don't attempt to render a
-            # samples/README.md.
-            if not kwargs["metadata"]["samples"]:
-                self.excludes.append("samples/README.md")
 
         t = templates.TemplateGroup(_TEMPLATES_DIR / directory, self.excludes)
         result = t.render(**kwargs)
@@ -61,8 +57,7 @@ def node_library(self, **kwargs) -> Path:
         #  .repo-metadata.json, or excluding README.md, we can remove this.
         if not os.path.exists("./.repo-metadata.json"):
             self.excludes.append("README.md")
-            if "samples/README.md" not in self.excludes:
-                self.excludes.append("samples/README.md")
+            self.excludes.append("samples/README.md")
 
         kwargs["metadata"] = node.read_metadata()
         kwargs["publish_token"] = node.get_publish_token(kwargs["metadata"]["name"])
@@ -95,7 +90,7 @@ def _load_samples(self, metadata: Dict):
             "file": "requesterPays.js"
         }
         """
-        metadata["samples"] = []
+        samples = []
         samples_dir = Path(os.getcwd()) / "samples"
         if os.path.exists(samples_dir):
             files = os.listdir(samples_dir)
@@ -107,9 +102,9 @@ def _load_samples(self, metadata: Dict):
                     # only add quickstart file to samples list if code sample is found.
                     if file == "quickstart.js" and not metadata.get("quickstart", None):
                         continue
-                    metadata["samples"].append(
-                        {"name": decamelize(file[:-3]), "file": file}
-                    )
+                    samples.append({"name": decamelize(file[:-3]), "file": file})
+        if samples:
+            metadata["samples"] = samples
 
     def _read_quickstart(self, samples_dir: Path) -> str:
         """