Upgrade jsonnet and gojsonnet to 0.20.0 (#1006)

The related jsonnet changelog are : - https://github.com/google/jsonnet/releases/tag/v0.18.0 - https://github.com/google/jsonnet/releases/tag/v0.19.0 - https://github.com/google/jsonnet/releases/tag/v0.19.1 - https://github.com/google/jsonnet/releases/tag/v0.20.0 Update search_imports function to return bytes according to the v0.19.0 changes mentioned there: https://github.com/google/jsonnet/releases/tag/v0.19.1 Co-authored-by: Ricardo Amaro <[email protected]>
kapicorp · Aug 22, 2023 · f594981 · f594981
1 parent c37f883
commit f594981
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/kapitan/resources.py b/kapitan/resources.py
@@ -210,12 +210,14 @@ def search_imports(cwd, import_str, search_paths):
     - search_paths is the location where to look for import_str if not in cwd
     The only supported parameters are cwd and import_str, so search_paths
     needs to be closured.
+    This function returns a tuple[str, bytes] since jsonnet 0.19.0 require the
+    content of the file to be provided as a bytes type instead of a str.
     """
     basename = os.path.basename(import_str)
     full_import_path = os.path.normpath(os.path.join(cwd, import_str))
 
     if full_import_path in JSONNET_CACHE:
-        return full_import_path, JSONNET_CACHE[full_import_path]
+        return full_import_path, JSONNET_CACHE[full_import_path].encode()
 
     if not os.path.exists(full_import_path):
         # if import_str not found, search in install_path
@@ -246,7 +248,7 @@ def search_imports(cwd, import_str, search_paths):
         normalised_path_content = f.read()
         JSONNET_CACHE[normalised_path] = normalised_path_content
 
-    return normalised_path, normalised_path_content
+    return normalised_path, normalised_path_content.encode()
 
 
 def inventory(search_paths, target, inventory_path=None):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ gitpython = "^3.1.30"
 google-api-python-client = "^2.15.0"
 hvac = "^0.11.0"
 jinja2 = "^3.0.1"
-jsonnet = "^0.18.0"
+jsonnet = "^0.20.0"
 jsonschema = "^4.17.3"
 kadet = "^0.2.2"
 python-gnupg = "^0.4.7"
@@ -61,7 +61,7 @@ certifi = "*"
 gitdb = "^4.0.10"
 packaging = "^23.0"
 typing-extensions = "^4.0.0"
-gojsonnet = { version = "^0.17.0", optional = true }
+gojsonnet = { version = "^0.20.0", optional = true }
 docker = { version = "^5.0.0", optional = true }
 
 [tool.poetry.extras]