From 2695d36b4f29f904076ffc0e03439a14cce448fb Mon Sep 17 00:00:00 2001 From: Chris Smalley Date: Wed, 2 Sep 2020 13:26:55 -0700 Subject: [PATCH] fix(plugins): Load ApiExtension config property from service yml in gate-plugins-test (#1323) --- .../com/netflix/spinnaker/gate/plugins/GateApiExtension.kt | 3 +-- gate-plugins-test/src/test/resources/gate-plugins-test.yml | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GateApiExtension.kt b/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GateApiExtension.kt index fe2bcef00..b368446f2 100644 --- a/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GateApiExtension.kt +++ b/gate-plugins-test/src/main/kotlin/com/netflix/spinnaker/gate/plugins/GateApiExtension.kt @@ -19,7 +19,6 @@ package com.netflix.spinnaker.gate.plugins import com.netflix.spinnaker.gate.api.extension.ApiExtension import com.netflix.spinnaker.gate.api.extension.HttpRequest import com.netflix.spinnaker.gate.api.extension.HttpResponse -import com.netflix.spinnaker.kork.plugins.api.ExtensionConfiguration import com.netflix.spinnaker.kork.plugins.api.PluginConfiguration import com.netflix.spinnaker.kork.plugins.api.PluginSdks import javax.annotation.Nonnull @@ -68,5 +67,5 @@ class GateApiExtension( @PluginConfiguration("api-extension") class ApiExtensionConfigProperties { - var id: String = "test" + var id: String = "" } diff --git a/gate-plugins-test/src/test/resources/gate-plugins-test.yml b/gate-plugins-test/src/test/resources/gate-plugins-test.yml index 29568c9ab..1dbc80541 100644 --- a/gate-plugins-test/src/test/resources/gate-plugins-test.yml +++ b/gate-plugins-test/src/test/resources/gate-plugins-test.yml @@ -39,6 +39,8 @@ spinnaker: plugins: com.netflix.gate.enabled.plugin: enabled: true + api-extension.config: + id: test com.netflix.gate.disabled.plugin: enabled: false com.netflix.gate.version.not.supported.plugin: