Gyro Vault

core/src/main/java/gyro/core/diff/Change.java

@@ -26,13 +26,15 @@
 import java.util.stream.Collectors;
 
 import com.google.common.collect.MapDifference;
+import com.google.common.collect.MapDifference.ValueDifference;
 import com.google.common.collect.Maps;
 import gyro.core.GyroUI;
 import gyro.core.resource.Diffable;
 import gyro.core.resource.DiffableField;
 import gyro.core.resource.DiffableInternals;
 import gyro.core.resource.DiffableType;
 import gyro.core.scope.State;
+import gyro.core.vault.VaultSecret;
 import org.apache.commons.lang3.StringUtils;
 
 public abstract class Change {
@@ -114,6 +116,20 @@ protected String stringify(Object value) {
                 .stream()
                 .map(e -> e.getKey() + ": " + stringify(e.getValue()))
                 .collect(Collectors.joining(", ")) + " }";
+        } else if (value instanceof ValueDifference) {
+            ValueDifference valueDifference = (ValueDifference) value;
+            if (valueDifference.rightValue() instanceof VaultSecret) {
+                return stringify(valueDifference.rightValue());
+            }
+
+            return String.format(
+                " %s → %s",
+                stringify(valueDifference.leftValue()),
+                stringify(valueDifference.rightValue()));
+
+        } else if (value instanceof Map.Entry) {
+            Map.Entry e = (Map.Entry) value;
+            return String.format(" %s: %s", e.getKey(), e.getValue());
 
         } else if (value instanceof String) {
             return "'" + value + "'";
@@ -157,6 +173,9 @@ protected void writeDifference(
                 } else if (p == null) {
                     ui.write(" @|red -|@ %s", stringify(c));
 
+                } else if (p instanceof VaultSecret) {
+                    ui.write(" @|yellow ⟳|@ %s", stringify(p));
+
                 } else {
                     ui.write(" @|yellow ⟳|@ %s → %s", stringify(c), stringify(p));
                 }
@@ -179,16 +198,7 @@ protected void writeDifference(
                 MapDifference<?, ?> diff = Maps.difference((Map<?, ?>) currentValue, (Map<?, ?>) pendingValue);
 
                 writeMapRemove(ui, diff.entriesOnlyOnLeft());
-
-                writeMap(
-                    ui,
-                    " @|yellow ⟳ {|@ %s @|yellow }|@",
-                    diff.entriesDiffering(),
-                    e -> String.format(
-                        "%s → %s",
-                        stringify(e.leftValue()),
-                        stringify(e.rightValue())));
-
+                writeMap(ui, " @|yellow ⟳ {|@ %s @|yellow }|@", diff.entriesDiffering(), this::stringify);
                 writeMapPut(ui, diff.entriesOnlyOnRight());
             }
 

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

@@ -0,0 +1,9 @@
+package gyro.core.resource;
+
+import gyro.lang.ast.Node;
+
+public interface CustomValue {
+
+    Node toStateNode();
+
+}

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

@@ -36,6 +36,7 @@
 import com.psddev.dari.util.ConversionException;
 import gyro.core.GyroException;
 import gyro.core.Reflections;
+import gyro.core.scope.DiffableScope;
 import gyro.core.scope.Scope;
 import gyro.core.validation.Required;
 import gyro.core.validation.ValidationError;
@@ -151,6 +152,16 @@ public boolean shouldBeDiffed() {
     }
 
     public Object getValue(Diffable diffable) {
+        DiffableScope scope = DiffableInternals.getScope(diffable);
+
+        if (scope != null) {
+            Object value = scope.get(name);
+
+            if (value != null) {
+                return value;
+            }
+        }
+
         return Reflections.invoke(getter, diffable);
     }
 

core/src/main/java/gyro/core/scope/RootScope.java

@@ -76,6 +76,9 @@
 import gyro.core.scope.converter.ResourceToIdObject;
 import gyro.core.validation.ValidationError;
 import gyro.core.validation.ValidationErrorException;
+import gyro.core.vault.VaultDirectiveProcessor;
+import gyro.core.vault.VaultPlugin;
+import gyro.core.vault.VaultReferenceResolver;
 import gyro.core.virtual.VirtualDirectiveProcessor;
 import gyro.core.workflow.CreateDirectiveProcessor;
 import gyro.core.workflow.DefineDirectiveProcessor;
@@ -124,7 +127,8 @@ public RootScope(String file, FileBackend backend, RootScope current, Set<String
             new ModificationPlugin(),
             new ReferencePlugin(),
             new ResourcePlugin(),
-            new RootPlugin())
+            new RootPlugin(),
+            new VaultPlugin())
             .forEach(p -> getSettings(PluginSettings.class).getPlugins().add(p));
 
         Stream.of(
@@ -148,6 +152,7 @@ public RootScope(String file, FileBackend backend, RootScope current, Set<String
             TypeDescriptionDirectiveProcessor.class,
             UpdateDirectiveProcessor.class,
             UsesCredentialsDirectiveProcessor.class,
+            VaultDirectiveProcessor.class,
             VirtualDirectiveProcessor.class,
             DefineDirectiveProcessor.class,
             WaitDirectiveProcessor.class,
@@ -156,7 +161,8 @@ public RootScope(String file, FileBackend backend, RootScope current, Set<String
             .forEach(p -> getSettings(DirectiveSettings.class).addProcessor(p));
 
         Stream.of(
-            FinderReferenceResolver.class)
+            FinderReferenceResolver.class,
+            VaultReferenceResolver.class)
             .forEach(r -> getSettings(ReferenceSettings.class).addResolver(r));
 
         Stream.of(
@@ -265,7 +271,9 @@ public <T extends Resource> T findResourceById(Class<T> resourceClass, Object id
         DiffableField idField = type.getIdField();
 
         if (idField == null) {
-            throw new GyroException(String.format("Unable to find @Id on a getter in %s", resourceClass.getSimpleName()));
+            throw new GyroException(String.format(
+                "Unable to find @Id on a getter in %s",
+                resourceClass.getSimpleName()));
         }
 
         return findResourcesByClass(resourceClass)

core/src/main/java/gyro/core/scope/State.java

@@ -40,6 +40,7 @@
 import gyro.core.diff.Change;
 import gyro.core.diff.Delete;
 import gyro.core.diff.Replace;
+import gyro.core.resource.CustomValue;
 import gyro.core.resource.Diffable;
 import gyro.core.resource.DiffableField;
 import gyro.core.resource.DiffableInternals;
@@ -284,6 +285,8 @@ private List<Node> toBodyNodes(Diffable diffable, Resource resource) {
                 } else {
                     body.add(toPairNode(key, value, resource));
                 }
+            } else if (value instanceof CustomValue) {
+                body.add(new PairNode(toNode(key, resource), ((CustomValue) value).toStateNode()));
 
             } else {
                 throw new GyroException(String.format(
@@ -318,6 +321,9 @@ private Node toNode(Object value, Resource self) {
 
             return new ListNode(items);
 
+        } else if (value instanceof CustomValue) {
+            return ((CustomValue) value).toStateNode();
+
         } else if (value instanceof Map) {
             List<PairNode> entries = new ArrayList<>();