Skip to content

fix(eager): don't defer meta-context variables during deferred import #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasmith-hs wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −3
Open

fix(eager): don't defer meta-context variables during deferred import #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,13 @@ public String reconstructImage(String fullName) {
String suffix = "";
JinjavaInterpreter interpreter = JinjavaInterpreter.getCurrent();

Optional<String> importFile = Optional.ofNullable(
(String) localContextScope.get(Context.IMPORT_RESOURCE_PATH_KEY)
);
Object importPath = localContextScope.get(Context.IMPORT_RESOURCE_PATH_KEY);
if (importPath instanceof DeferredValue) {
importPath = ((DeferredValue) importPath).getOriginalValue();
}
Optional<String> importFile = importPath instanceof String
? Optional.of((String) importPath)
: Optional.empty();
Object currentDeferredImportResource = null;
if (importFile.isPresent()) {
currentDeferredImportResource =
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/hubspot/jinjava/lib/tag/ImportTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.hubspot.jinjava.interpret.DeferredValueException;
import com.hubspot.jinjava.interpret.InterpretException;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.MetaContextVariables;
import com.hubspot.jinjava.interpret.TagCycleException;
import com.hubspot.jinjava.interpret.TemplateError;
import com.hubspot.jinjava.interpret.TemplateError.ErrorItem;
Expand Down Expand Up @@ -212,6 +213,9 @@ public static void handleDeferredNodesDuringImport(
}
childBindings.remove(Context.GLOBAL_MACROS_SCOPE_KEY);
childBindings.forEach((key, value) -> {
if (MetaContextVariables.isMetaContextVariable(key, interpreter.getContext())) {
return;
}
Object originalValue = value instanceof DeferredValue
? ((DeferredValue) value).getOriginalValue()
: null;
Expand Down
23 changes: 23 additions & 0 deletions src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,29 @@ public void itPreservesOriginalValueOfDeferredImportedBindings() {
.isNull();
}

@Test
public void itDoesNotDeferMetaContextVariablesDuringDeferredImport() {
JinjavaInterpreter child = getChildInterpreter(interpreter, "");
Map<String, Object> childBindings = new HashMap<>();
childBindings.put(Context.IMPORT_RESOURCE_PATH_KEY, TEMPLATE_FILE);
childBindings.put("request", DeferredValue.instance("the real request"));

ImportTag.handleDeferredNodesDuringImport(
interpreter.parse(""),
"",
childBindings,
child,
interpreter
);

assertThat(interpreter.getContext().get(Context.IMPORT_RESOURCE_PATH_KEY)).isNull();
assertThat(interpreter.getContext().get("request")).isInstanceOf(DeferredValue.class);
assertThat(
((DeferredValue) interpreter.getContext().get("request")).getOriginalValue()
)
.isEqualTo("the real request");
}

@Test
@SuppressWarnings("unchecked")
public void itHandlesMultiLayerSomeAliased() {
Expand Down
Loading