Template directories passed to options are turned into absolute paths (#409)

Author: software-dov

gapic/generator/options.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from collections import defaultdict
+from os import path
 from typing import Any, DefaultDict, Dict, FrozenSet, List, Optional, Tuple
 
 import dataclasses
@@ -95,13 +96,19 @@ def build(cls, opt_string: str) -> 'Options':
         # may be our default; perform that replacement.
         default_token = 'DEFAULT'
         templates = opts.pop('templates', [default_token])
-        default_path = os.path.realpath(
-            os.path.join(os.path.dirname(__file__), '..', 'templates'),
-        )
-        templates = [
-            (default_path if path == default_token else path)
-            for path in templates
-        ]
+        pwd = path.join(path.dirname(__file__), '..')
+        default_path = path.realpath(path.join(pwd, 'templates'))
+
+        def tweak_path(p):
+            if p == default_token:
+                return default_path
+
+            if path.isabs(p):
+                return path.normpath(p)
+
+            return path.normpath(path.join(pwd, p))
+
+        templates = [tweak_path(p) for p in templates]
 
         retry_cfg = None
         retry_paths = opts.pop('retry-config', None)
@@ -121,7 +128,7 @@ def build(cls, opt_string: str) -> 'Options':
                 for s in sample_paths
                 for cfg_path in samplegen_utils.generate_all_sample_fpaths(s)
             ),
-            templates=tuple(os.path.expanduser(i) for i in templates),
+            templates=tuple(path.expanduser(i) for i in templates),
             lazy_import=bool(opts.pop('lazy-import', False)),
             old_naming=bool(opts.pop('old-naming', False)),
         )

tests/unit/generator/test_generator.py

@@ -36,7 +36,7 @@ def test_custom_template_directory():
     g = generator.Generator(opts)
 
     # Assert that the Jinja loader will pull from the correct location.
-    assert g._env.loader.searchpath == ['/templates/']
+    assert g._env.loader.searchpath == ['/templates']
 
 
 def test_get_response():

tests/unit/generator/test_options.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 import pytest
 from unittest import mock
 import warnings
@@ -31,7 +32,14 @@ def test_options_empty():
 def test_options_replace_templates():
     opts = options.Options.build('python-gapic-templates=/foo/')
     assert len(opts.templates) == 1
-    assert opts.templates[0] == '/foo/'
+    assert opts.templates[0] == '/foo'
+
+
+def test_options_relative_templates():
+    opts = options.Options.build('python-gapic-templates=../../squid/clam')
+
+    expected = (os.path.abspath('../squid/clam'),)
+    assert opts.templates == expected
 
 
 def test_options_unrecognized():