fix(discovery): fixes admin controller disable behavior (#4149)

orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/AdminController.groovy

@@ -17,6 +17,7 @@
 
 package com.netflix.spinnaker.orca.controllers
 
+import com.netflix.spinnaker.kork.discovery.DiscoveryStatusPublisher
 import com.netflix.spinnaker.kork.discovery.NoDiscoveryStatusPublisher
 import com.netflix.spinnaker.kork.exceptions.HasAdditionalAttributes
 import com.netflix.spinnaker.kork.web.exceptions.ValidationException
@@ -26,10 +27,7 @@ import com.netflix.spinnaker.orca.front50.Front50Service
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository
 import groovy.util.logging.Slf4j
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.context.ApplicationEventPublisher
-import org.springframework.context.ApplicationListener
-import org.springframework.context.event.ContextRefreshedEvent
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
@@ -43,8 +41,7 @@ import org.springframework.web.bind.annotation.RestController
 @Slf4j
 class AdminController {
   @Autowired(required = false)
-  @Qualifier("discoveryStatusListener")
-  ApplicationListener<ContextRefreshedEvent> discoveryStatusPoller
+  DiscoveryStatusPublisher discoveryStatusPublisher
 
   @Autowired
   ApplicationEventPublisher applicationEventPublisher
@@ -60,13 +57,13 @@ class AdminController {
 
   @RequestMapping(value = "/instance/enabled", method = RequestMethod.POST)
   void setInstanceStatus(@RequestBody Map<String, Boolean> enabledWrapper) {
-    if (!discoveryStatusPoller) {
+    if (!discoveryStatusPublisher) {
       log.warn("No configured discovery status poller")
       return
     }
 
-    if (!discoveryStatusPoller instanceof NoDiscoveryStatusPublisher) {
-      throw new DiscoveryUnchangeableException("Discovery status cannot be overwritten", discoveryStatusPoller.class)
+    if (!(discoveryStatusPublisher instanceof NoDiscoveryStatusPublisher)) {
+      throw new DiscoveryUnchangeableException("Discovery status cannot be overwritten", DiscoveryStatusPublisher)
     }
 
 
@@ -75,7 +72,7 @@ class AdminController {
       throw new ValidationException("The field \"enabled\" must be set", null)
     }
 
-    NoDiscoveryStatusPublisher noDiscoveryApplicationStatusPublisher = (NoDiscoveryStatusPublisher) discoveryStatusPoller;
+    NoDiscoveryStatusPublisher noDiscoveryApplicationStatusPublisher = (NoDiscoveryStatusPublisher) discoveryStatusPublisher;
     noDiscoveryApplicationStatusPublisher.setInstanceEnabled(enabled)
   }
 

orca-web/src/test/kotlin/com/netflix/spinnaker/orca/controllers/AdminControllerTest.kt

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021 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.orca.controllers
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.netflix.spinnaker.orca.api.test.OrcaFixture
+import com.netflix.spinnaker.orca.api.test.orcaFixture
+import com.netflix.spinnaker.q.discovery.DiscoveryActivator
+import dev.minutest.junit.JUnit5Minutests
+import dev.minutest.rootContext
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.http.MediaType
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.post
+import strikt.api.expectThat
+import strikt.assertions.isEqualTo
+import strikt.assertions.isFalse
+import strikt.assertions.isTrue
+
+class AdminControllerTest : JUnit5Minutests {
+
+  fun tests() = rootContext<Fixture> {
+    orcaFixture {
+      Fixture()
+    }
+
+    test("/admin/instance/enabled endpoint can disable queue Activator") {
+      expectThat(discoveryActivator.enabled).isTrue()
+
+      val response = mockMvc.post("/admin/instance/enabled") {
+        contentType = MediaType.APPLICATION_JSON
+        content = jacksonObjectMapper().writeValueAsString(mapOf("enabled" to false))
+      }.andReturn().response
+
+      expectThat(response.status).isEqualTo(200)
+
+      expectThat(discoveryActivator.enabled).isFalse()
+    }
+  }
+
+  @AutoConfigureMockMvc
+  class Fixture : OrcaFixture() {
+
+    @Autowired
+    lateinit var mockMvc: MockMvc
+
+    @Autowired
+    lateinit var discoveryActivator: DiscoveryActivator
+  }
+}