Feat(plugins): adding ability to use plugins (#3058)

* Feat(plugins): adding ability to use plugins * chore(plugin): Scan plugins package
spinnaker · Jul 25, 2019 · a437747 · a437747
1 parent af2f20a
commit a437747
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/orca-web/orca-web.gradle b/orca-web/orca-web.gradle
@@ -60,6 +60,7 @@ dependencies {
   implementation("com.netflix.spinnaker.kork:kork-exceptions")
   implementation("com.netflix.spinnaker.kork:kork-stackdriver")
   implementation("com.netflix.spinnaker.kork:kork-web")
+  implementation("com.netflix.spinnaker.kork:kork-plugins")
   implementation("net.logstash.logback:logstash-logback-encoder")
   implementation("com.netflix.spinnaker.fiat:fiat-api:$fiatVersion")
   implementation("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion")

diff --git a/orca-web/src/main/groovy/com/netflix/spinnaker/orca/Main.groovy b/orca-web/src/main/groovy/com/netflix/spinnaker/orca/Main.groovy
@@ -21,6 +21,7 @@ import com.netflix.spinnaker.config.QosConfiguration
 import com.netflix.spinnaker.config.StackdriverConfig
 import com.netflix.spinnaker.config.TomcatConfiguration
 import com.netflix.spinnaker.kork.PlatformComponents
+import com.netflix.spinnaker.kork.plugins.spring.SpinnakerApplication
 import com.netflix.spinnaker.orca.applications.config.ApplicationConfig
 import com.netflix.spinnaker.orca.bakery.config.BakeryConfiguration
 import com.netflix.spinnaker.orca.clouddriver.config.CloudDriverConfiguration
@@ -85,9 +86,9 @@ import org.springframework.scheduling.annotation.EnableAsync
   GremlinConfiguration
 ])
 @ComponentScan([
-  "com.netflix.spinnaker.config"
+  "com.netflix.spinnaker.config", "com.netflix.spinnaker.plugin"
 ])
-class Main extends SpringBootServletInitializer {
+class Main extends SpinnakerApplication {
   static final Map<String, String> DEFAULT_PROPS = [
     'netflix.environment'              : 'test',
     'netflix.account'                  : '${netflix.environment}',
@@ -99,7 +100,7 @@ class Main extends SpringBootServletInitializer {
   ]
 
   static void main(String... args) {
-    new SpringApplicationBuilder().properties(DEFAULT_PROPS).sources(Main).run(args)
+    SpinnakerApplication.initialize(DEFAULT_PROPS, Main, args)
   }
 
   @Override