fix(plugins): plugins should be able to reference their own config values

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/node/Plugins.java

@@ -49,7 +49,8 @@ public Map<String, Object> getPluginConfigurations() {
         plugins.stream()
             .filter(p -> p.getEnabled())
             .filter(p -> !p.getManifestLocation().isEmpty())
-            .collect(Collectors.toMap(p -> p.getName(), p -> p.getCombinedOptions()));
+            .collect(
+                Collectors.toMap(p -> p.generateManifest().getName(), p -> p.getCombinedOptions()));
 
     fullyRenderedYaml.put("plugins", pluginMetadata);
     return fullyRenderedYaml;

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/plugins/Plugin.java

@@ -36,10 +36,10 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class Plugin extends Node {
-  public String name;
-  public Boolean enabled;
-  public String manifestLocation;
-  public Map<String, Object> options = new HashMap<>();
+  private String name;
+  private Boolean enabled;
+  private String manifestLocation;
+  private Map<String, Object> options = new HashMap<>();
 
   @Override
   public String getNodeName() {
@@ -113,6 +113,6 @@ public static Map<String, Object> merge(
   }
 
   public Map<String, Object> getCombinedOptions() {
-    return Plugin.merge(generateManifest().getOptions(), options);
+    return Plugin.merge(generateManifest().getOptions(), getOptions());
   }
 }

halyard-config/src/test/groovy/com/netflix/spinnaker/halyard/config/model/v1/plugins/PluginsSpec.groovy

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2019 Armory, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.spinnaker.halyard.config.model.v1.plugins
+
+import com.netflix.spinnaker.halyard.config.model.v1.node.Plugins
+import spock.lang.Specification
+
+class PluginsSpec extends Specification {
+
+    void "getPluginConfigurations works correctly"() {
+        setup:
+        def plugins = new Plugins()
+        def plugin = Spy(Plugin)
+        def manifest = Stub(Manifest)
+        manifest.name >> 'namespace/name'
+        manifest.options >> [foo: 'bar']
+        plugin.manifestLocation >> 'manifest-location'
+        plugin.enabled >> true
+        plugin.options >> [cat: 'dog']
+        plugin.name >> 'should-not-be-present'
+        plugins.setPlugins([plugin])
+
+        plugin.generateManifest() >> manifest
+
+        when:
+        def subject = plugins.getPluginConfigurations()
+
+        then:
+        def expectedOptions = [
+                plugins: [
+                        'namespace/name': [
+                                foo: 'bar',
+                                cat: 'dog'
+                        ]
+                ]
+        ]
+        subject == expectedOptions
+    }
+}