Merge pull request #303 from perfectsense/feature/update-scope

Fixes to expose pending and current workflow resources to update action.

core/src/main/java/gyro/core/resource/DiffableInternals.java

@@ -28,6 +28,7 @@
 import gyro.core.scope.DiffableScope;
 import gyro.core.scope.NodeEvaluator;
 import gyro.core.scope.RootScope;
+import gyro.core.scope.Scope;
 import gyro.core.workflow.ModifiedIn;
 import gyro.lang.ast.Node;
 import gyro.lang.ast.block.BlockNode;
@@ -111,13 +112,27 @@ public static void reevaluate(Diffable diffable) {
      * Create a new scope that is disconnected from the original configuration.
      *
      * @param diffable The diffable to disconnect
+     * @param scope parent scope to override
      */
-    public static void disconnect(Diffable diffable) {
-        diffable.scope = new DiffableScope(diffable.scope.getParent(), null);
+    public static void disconnect(Diffable diffable, Scope scope) {
+        if (scope == null) {
+            scope = diffable.scope.getParent();
+        }
+
+        diffable.scope = new DiffableScope(scope, null);
 
         disconnectChildren(diffable);
     }
 
+    /**
+     * Create a new scope that is disconnected from the original configuration.
+     *
+     * @param diffable The diffable to disconnect
+     */
+    public static void disconnect(Diffable diffable) {
+        disconnect(diffable, null);
+    }
+
     /**
      * Create a new scope that is disconnected from the original configuration.
      *

core/src/main/java/gyro/core/workflow/UpdateAction.java

@@ -69,7 +69,7 @@ public void execute(
         Resource pendingResource = visitResource(resource, scope);
         DiffableInternals.setModifiedIn(pendingResource, modifiedIn);
 
-        DiffableInternals.disconnect(pendingResource);
+        DiffableInternals.disconnect(pendingResource, scope);
         DiffableScope resourceScope = DiffableInternals.getScope(pendingResource);
         NodeEvaluator evaluator = pending.getEvaluator();